[X2Go-Commits] [x2godesktopsharing] 11/13: Revert "x2godesktopsharing.spec: obsolete and provide x2godesktopsharing in x2goserver-desktopsharing."
git-admin at x2go.org
git-admin at x2go.org
Wed Nov 14 10:08:53 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 d08937780d6b88652d60d4770cebc4cf38052a32
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date: Wed Nov 14 10:06:09 2018 +0100
Revert "x2godesktopsharing.spec: obsolete and provide x2godesktopsharing in x2goserver-desktopsharing."
This reverts commit a23b23ff6de63dbc35af02fecb0d7966f723b490.
---
debian/changelog | 1 -
x2godesktopsharing.spec | 9 +--------
2 files changed, 1 insertion(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index f40b4ac..a3b3177 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,7 +17,6 @@ x2godesktopsharing (3.2.0.0-0x2go1) UNRELEASED; urgency=medium
+ We actually care about SLE{S,D} 11.x still... fixup comment.
+ Fix lrelease-qt5 call (missing number).
+ Use Qt4 for SLES 11.x builds.
- + Obsolete and provide x2godesktopsharing in x2goserver-desktopsharing.
[ Mike Gabriel ]
* New upstream version (3.1.1.5):
diff --git a/x2godesktopsharing.spec b/x2godesktopsharing.spec
index 4686c04..6ec852d 100644
--- a/x2godesktopsharing.spec
+++ b/x2godesktopsharing.spec
@@ -78,14 +78,7 @@ 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
X2Go is a server based computing environment with
@@ -152,7 +145,7 @@ fi
/usr/bin/gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
-%files -n x2goserver-desktopsharing
+%files
%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