[x2goserver] Do not require x2goserver-xession, do not ship feature file in main package

Orion Poplawski orion at fedoraproject.org
Fri Oct 24 16:55:23 UTC 2014


commit 476f098dd8be199df275aa2a552ad7210a4590a6
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Fri Oct 24 10:55:28 2014 -0600

    Do not require x2goserver-xession, do not ship feature file in main package

 x2goserver.spec |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/x2goserver.spec b/x2goserver.spec
index e98a8c4..e440ad1 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -1,7 +1,7 @@
 #global checkout 20130722git65169c9
 Name:           x2goserver
 Version:        4.0.1.18
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        X2Go Server
 
 Group:          Applications/Communications
@@ -44,7 +44,6 @@ Requires:       sshfs
 # For /etc/sudoers.d
 Requires:       sudo
 Requires:       x2goagent >= 3.5.0.25
-Requires:       x2goserver-xession
 Requires:       xorg-x11-fonts-misc
 Requires:       xorg-x11-xauth
 Requires(pre):  shadow-utils
@@ -289,9 +288,13 @@ exit 0
 %{_mandir}/man8/x2go*.8*
 %exclude %{_mandir}/man8/x2gofm.8*
 %exclude %{_mandir}/man8/x2goprint.8*
-%{_datadir}/x2go/
-%exclude %{_datadir}/x2go/versions/VERSION.x2goserver-printing
-%exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
+%dir %{_datadir}/x2go/
+%dir %{_datadir}/x2go/versions
+%{_datadir}/x2go/versions/VERSION.x2goserver
+%{_datadir}/x2go/versions/VERSION.x2goserver-extensions
+%dir %{_datadir}/x2go/x2gofeature.d
+%{_datadir}/x2go/x2gofeature.d/x2goserver.features
+%{_datadir}/x2go/x2gofeature.d/x2goserver-extensions.features
 %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
 %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
 %if 0%{?fedora} || 0%{?rhel} >= 7
@@ -325,6 +328,9 @@ exit 0
 
 
 %changelog
+* Fri Oct 24 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.18-3
+- Do not require x2goserver-xession, do not ship feature file in main package
+
 * Fri Oct 24 2014 Orion Poplawski <orion at cora.nwra.com> - 4.0.1.18-2
 - Require x2goserver-xession
 


More information about the scm-commits mailing list