[glusterfs/f16] revised spec to correctly do init.d for fedora<=16, rhel<=6; native systemd for f17 and rhel7

Kaleb S. KEITHLEY kkeithle at fedoraproject.org
Tue Jan 3 16:25:05 UTC 2012


commit 5b0b5ff7293be512b06a05125c86b7898b9699ff
Author: Kaleb KEITHLEY <kkeithle at redhat.com>
Date:   Tue Jan 3 11:24:13 2012 -0500

    revised spec to correctly do init.d for fedora<=16, rhel<=6; native
    systemd for f17 and rhel7

 glusterfs.spec |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/glusterfs.spec b/glusterfs.spec
index d1ec7f0..be2e095 100644
--- a/glusterfs.spec
+++ b/glusterfs.spec
@@ -40,7 +40,7 @@ Source6:          glusterfsd.logrotate
 Patch0:           libglusterfs.Makefile.patch
 BuildRoot:        %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
-%if ( 0%{?fedora} < 17 || 0%{?rhel} < 7 )
+%if ( 0%{?fedora} && 0%{?fedora} < 17 ) || ( 0%{?rhel} && 0%{?rhel} < 7 )
 Source7:          glusterd.init
 Source8:          glusterfsd.init
 Requires(post):   /sbin/chkconfig
@@ -391,6 +391,10 @@ if [ $1 -ge 1 ]; then
 fi
 
 %changelog
+* Tue Jan 3 2012 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-5
+- revised spec for init.d for fedora<=16, rhel<=6; native systemd for
+  f17 and rhel7
+
 * Wed Dec 7 2011 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 3.2.5-4
 - revised sysconfig and init.d scripts. (glusterfsd.{init,sysconfig,service}
   should go away, as glusterd is responsible for starting and stopping it.)


More information about the scm-commits mailing list