[x2goserver/epel7] Update conditionals for rhel7

Orion Poplawski orion at fedoraproject.org
Mon Jan 27 03:49:09 UTC 2014


commit e549182fccec354419850a379d77149d74ce4096
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Jan 26 20:49:31 2014 -0700

    Update conditionals for rhel7

 x2goserver.spec |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/x2goserver.spec b/x2goserver.spec
index 50d4c22..143412f 100644
--- a/x2goserver.spec
+++ b/x2goserver.spec
@@ -16,7 +16,7 @@ Source1:        x2gocleansessions.service
 Source2:        x2gocleansessions.init
 
 BuildRequires:  perl(ExtUtils::MakeMaker)
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 BuildRequires:  man2html-core
 BuildRequires:  systemd
 %else
@@ -170,7 +170,7 @@ touch %{buildroot}%{_sharedstatedir}/x2go/x2go_sessions
 # Printing spool dir
 mkdir -p %{buildroot}%{_localstatedir}/spool/x2goprint
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 # System.d session cleanup script
 mkdir -p %{buildroot}%{_unitdir}
 install -pm0644 %SOURCE1 %{buildroot}%{_unitdir}
@@ -196,7 +196,7 @@ exit 0
   egrep "^backend=sqlite.*" /etc/x2go/x2gosql/sql >/dev/null 2>&1 &&
   %{_sbindir}/x2godbadmin --createdb >/dev/null 2>&1 || :
 
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %systemd_post x2gocleansessions.service
 
 %preun
@@ -279,7 +279,7 @@ exit 0
 %exclude %{_datadir}/x2go/x2gofeature.d/x2goserver-printing.features
 %attr(0775,root,x2gouser) %dir %{_sharedstatedir}/x2go/
 %ghost %attr(0660,root,x2gouser) %{_sharedstatedir}/x2go/x2go_sessions
-%if 0%{?fedora}
+%if 0%{?fedora} || 0%{?rhel} >= 7
 %{_unitdir}/x2gocleansessions.service
 %else
 %{_initddir}/x2gocleansessions


More information about the scm-commits mailing list