[X2Go-Commits] [x2godesktopsharing] 08/13: Revert "x2godesktopsharing.spec: remove package names from %prep, %build and %install macros."

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository x2godesktopsharing.

commit d8584be8dc519e210d80670ac8a4c3068eb0ece2
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 14 10:06:07 2018 +0100

    Revert "x2godesktopsharing.spec: remove package names from %prep, %build and %install macros."
    
    This reverts commit e4ded9acbb871f0b6dc244d43cef15855fb23b06.
---
 debian/changelog        | 1 -
 x2godesktopsharing.spec | 6 +++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 86a27b9..8c54e07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,7 +20,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
     + Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing.
     + Remove first erroneous Group line.
     + Rename other sections to x2goserver-desktopsharing.
-    + Remove package names from %prep, %build and %install macros.
 
   [ Mike Gabriel ]
   * New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 3cc0526..756f9fb 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -100,11 +100,11 @@ grant other X2Go users access to the current session (shadow session
 support). The current session may be an X2Go session itself or simply
 a local X11 session.
 
-%prep
+%prep -n x2goserver-desktopsharing
 %setup -q
 
 
-%build
+%build -n x2goserver-desktopsharing
 %if 0%{?suse_version} && 0%{?suse_version} < 1315
 lrelease x2godesktopsharing.pro
 qmake QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=":" x2godesktopsharing.pro
@@ -115,7 +115,7 @@ qmake-qt5 QMAKE_CFLAGS+="%{optflags}" QMAKE_CXXFLAGS+="%{optflags}" QMAKE_STRIP=
 make %{?_smp_mflags}
 
 
-%install
+%install -n x2goserver-desktopsharing
 mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go}
 cp -p %{name} %{buildroot}%{_bindir}/
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2godesktopsharing.git