[nfs-ganesha] use upstream init.d script

Kaleb S. KEITHLEY kkeithle at fedoraproject.org
Tue Oct 28 11:37:06 UTC 2014


commit 3fae8359ca590290af3a58951ef68b3373f444d1
Author: Kaleb S. KEITHLEY <kkeithle at redhat.com>
Date:   Tue Oct 28 07:36:57 2014 -0400

    use upstream init.d script

 nfs-ganesha.spec |    9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)
---
diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec
index dec622c..b46372a 100644
--- a/nfs-ganesha.spec
+++ b/nfs-ganesha.spec
@@ -27,7 +27,7 @@
 
 Name:              nfs-ganesha
 Version:           2.1.0
-Release:           9%{?prereltag:.%{prereltag}}%{?dist}
+Release:           10%{?prereltag:.%{prereltag}}%{?dist}
 Summary:           Ganesha NFS Server
 Group:             System Environment/Libraries
 License:           LGPLv3+
@@ -38,8 +38,6 @@ ExclusiveArch:     aarch64
 Source0:           https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
 Source1:           https://github.com/%{name}/%{ntirpcname}/archive/v%{ntirpcvers}/%{ntirpcname}-%{ntirpcvers}.tar.gz
 Source2:           nfs-ganesha.service
-Source3:           nfs-ganesha.init
-Source4:           nfs_ganesha.sh
 Patch3:            nfs-ganesha-2.0.0-no-strict-aliasing.patch
 Patch6:            nfs-ganesha-2.1.0-config_parsing.patch
 Patch7:            nfs-ganesha-2.1.0-cache_inode_getattr.patch
@@ -198,7 +196,7 @@ cp -p src/Docs/*.pdf %{buildroot}%{_pkgdocdir}/
 %if ( 0%{?_with_systemd:1} )
 install -D -p -m 0644 src/scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-ganesha.service
 %else
-install -D -p -m 0744 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
+install -D -p -m 0744 src/ganesha.init %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha
 install -D -p -m 0744 %{SOURCE4} %{buildroot}%{_sbindir}/nfs_ganesha.sh
 %endif
 install -D -p -m 0644 src/scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/nfs-ganesha
@@ -266,6 +264,9 @@ install -D -p -m 0644 src/scripts/ganeshactl/org.ganesha.nfsd.conf %{buildroot}%
 %dir %{_pkgdocdir}
 
 %changelog
+* Mon Oct 27 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-10
+- use upstream init.d script
+
 * Thu Oct 2 2014 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.1.0-9
 - restore exclusion of gluster gfapi on rhel
 


More information about the scm-commits mailing list