[X2Go-Commits] [x2godesktopsharing] 09/13: Revert "x2godesktopsharing.spec: rename other sections to x2goserver-desktopsharing."

[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 18720f24dbd2e5ea457909ef60edaffa2f02b085
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Wed Nov 14 10:06:08 2018 +0100

    Revert "x2godesktopsharing.spec: rename other sections to x2goserver-desktopsharing."
    
    This reverts commit d2f95d4b22d1f0333203483a9430aad9fc66b594.
---
 debian/changelog        |  1 -
 x2godesktopsharing.spec | 16 ++++++++--------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8c54e07..4b37c97 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,7 +19,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
     + Use Qt4 for SLES 11.x builds.
     + Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing.
     + Remove first erroneous Group line.
-    + Rename other sections to x2goserver-desktopsharing.
 
   [ Mike Gabriel ]
   * New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 756f9fb..e9e98d3 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -86,7 +86,7 @@ Group:          Applications/Communications
 Obsoletes:      x2godesktopsharing
 Provides:       x2godesktopsharing = %{version}-%{release}
 
-%description -n x2goserver-desktopsharing
+%description
 X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
@@ -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 -n x2goserver-desktopsharing
+%prep
 %setup -q
 
 
-%build -n x2goserver-desktopsharing
+%build
 %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 -n x2goserver-desktopsharing
+%install
 mkdir -p %{buildroot}%{_bindir} %{buildroot}%{_datadir}/{applications,x2go}
 cp -p %{name} %{buildroot}%{_bindir}/
 desktop-file-install --dir %{buildroot}%{_datadir}/applications %{name}.desktop
@@ -134,20 +134,20 @@ cp -rp man %{buildroot}%{_datadir}/
 %endif
 
 
-%pre -n x2ogserver-desktopsharing
+%pre
 # Needed for sharing a desktop with another user
 getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing
 
-%post -n x2goserver-desktopsharing
+%post
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%postun -n x2goserver-desktopsharing
+%postun
 if [ $1 -eq 0 ] ; then
     /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null
     /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
-%posttrans -n x2goserver-desktopsharing
+%posttrans
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 

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