[X2Go-Commits] [x2godesktopsharing] 05/13: Revert "x2godesktopsharing.spec: completely rename to x2goserver-desktopsharing, drop name overrides."

git-admin at x2go.org git-admin at x2go.org
Wed Nov 14 10:08:51 CET 2018


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

x2go pushed a commit to branch master
in repository x2godesktopsharing.

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

    Revert "x2godesktopsharing.spec: completely rename to x2goserver-desktopsharing, drop name overrides."
    
    This reverts commit 7e0b185551736c867b598f492ef520fe1fc52c38.
---
 debian/changelog        |  1 -
 x2godesktopsharing.spec | 21 ++++++++++++++-------
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bca62a9..1cb159b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
     + Remove package names from %prep, %build and %install macros.
     + Fix typo in %pre scriptlet package name.
     + Really fix the typo.
-    + Completely rename to x2goserver-desktopsharing, drop name overrides.
 
   [ Mike Gabriel ]
   * New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index dadcea7..67d0dd9 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -1,4 +1,4 @@
-Name:           x2goserver-desktopsharing
+Name:           x2godesktopsharing
 Version:        3.2.0.0
 Release:        0.0x2go1%{?dist}
 Summary:        Share X11 desktops with other users via X2Go
@@ -76,10 +76,17 @@ Requires:       procps-ng
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
+%package -n x2goserver-desktopsharing
+Summary:        Share X11 desktops with other users via X2Go
+%if 0%{?suse_version}
+Group:          Production/Networking/Remote Desktop
+%else
+Group:          Applications/Communications
+%endif
 Obsoletes:      x2godesktopsharing
 Provides:       x2godesktopsharing = %{version}-%{release}
 
-%description
+%description -n x2goserver-desktopsharing
 X2Go is a server based computing environment with
     - session resuming
     - low bandwidth support
@@ -127,24 +134,24 @@ cp -rp man %{buildroot}%{_datadir}/
 %endif
 
 
-%pre
+%pre -n x2goserver-desktopsharing
 # Needed for sharing a desktop with another user
 getent group x2godesktopsharing >/dev/null || groupadd -r x2godesktopsharing
 
-%post
+%post -n x2goserver-desktopsharing
 /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
-%postun
+%postun -n x2goserver-desktopsharing
 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
+%posttrans -n x2goserver-desktopsharing
 /usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
-%files
+%files -n x2goserver-desktopsharing
 %defattr(-,root,root)
 %doc debian/changelog
 %doc debian/copyright

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


More information about the x2go-commits mailing list