From 400ed36d12b74c71c7483b540c7417bbef6c9c3f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 6 Oct 2015 18:04:41 -0400 Subject: [PATCH] 2.3.0 RC5 revised scripts/ganeshactl/CMakeLists.txt.patch --- ...c5-scripts-ganeshactl-CMakeLists.txt.patch | 10 +++ nfs-ganesha.spec | 65 +++++++++---------- 2 files changed, 40 insertions(+), 35 deletions(-) create mode 100644 nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch diff --git a/nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch b/nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch new file mode 100644 index 0000000..dd230e3 --- /dev/null +++ b/nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch @@ -0,0 +1,10 @@ +--- nfs-ganesha-2.3-rc5/src/scripts/ganeshactl/CMakeLists.txt.orig 2015-10-06 14:15:53.881664072 -0400 ++++ nfs-ganesha-2.3-rc5/src/scripts/ganeshactl/CMakeLists.txt 2015-10-06 14:16:16.232664072 -0400 +@@ -124,6 +124,6 @@ + + install( + CODE +- "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install --skip-build --prefix=$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})" ++ "execute_process(WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMAND ${PYTHON} ${SETUP_PY} install --skip-build --prefix=\$ENV{DESTDIR}${CMAKE_INSTALL_PREFIX})" + ) + endif(PYTHON) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 2483f4c..875d370 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -82,14 +82,14 @@ Name: nfs-ganesha Version: 2.3.0 -Release: 0.6%{?dev_version:%{dev_version}}%{?dist} +Release: 0.7%{?dev_version:%{dev_version}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki Source0: https://github.com/%{name}/%{name}/archive/V%{versiontag}/%{name}-%{versiontag}.tar.gz -Patch1: nfs-ganesha-2.3rc3-scripts-ganeshactl-CMakeLists.txt.patch +Patch1: nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch BuildRequires: cmake BuildRequires: bison @@ -117,11 +117,11 @@ BuildRequires: libmooshika-devel >= 0.6-0 BuildRequires: jemalloc-devel %endif %if %{with lustre_up} -BuildRequires: lcap-devel >= 0.1-0 +BuildRequires: lcap-devel >= 0.1-0 %endif %if %{with_systemd} -BuildRequires: systemd -Requires(post): systemd +BuildRequires: systemd +Requires(post): systemd Requires(preun): systemd Requires(postun): systemd %else @@ -168,8 +168,7 @@ be used with NFS-Ganesha to support PROXY based filesystems %package utils Summary: The NFS-GANESHA's util scripts Group: Applications/System -Requires: dbus-python -Requires: pygobject2 +Requires: dbus-python, pygobject2 %if %{with gui_utils} BuildRequires: PyQt4-devel Requires: PyQt4 @@ -224,9 +223,9 @@ be used with NFS-Ganesha to support GPFS backend %package ceph Summary: The NFS-GANESHA's CEPH FSAL Group: Applications/System +Requires: nfs-ganesha = %{version}-%{release} Requires: ceph >= 0.78 BuildRequires: ceph-devel >= 0.78 -Requires: nfs-ganesha = %{version}-%{release} %description ceph This package contains a FSAL shared object to @@ -252,7 +251,8 @@ be used with NFS-Ganesha to support LUSTRE %package shook Summary: The NFS-GANESHA's LUSTRE/SHOOK FSAL Group: Applications/System -Requires: nfs-ganesha = %{version}-%{release}, lustre, shook-client +Requires: nfs-ganesha = %{version}-%{release} +Requires: lustre shook-client BuildRequires: libattr-devel lustre shook-devel %description shook @@ -303,7 +303,7 @@ be used with NFS-Ganesha to support PANFS %package pt Summary: The NFS-GANESHA's PT FSAL Group: Applications/System -Requires: nfs-ganesha = %{version}-%{release} +Requires: nfs-ganesha = %{version}-%{release} %description pt @@ -317,9 +317,8 @@ be used with NFS-Ganesha to support PT Summary: The NFS-GANESHA's GLUSTER FSAL Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} -BuildRequires: glusterfs-api-devel >= 3.7.4 -BuildRequires: libattr-devel -BuildRequires: libacl-devel +BuildRequires: glusterfs-api-devel >= 3.7.4 +BuildRequires: libattr-devel, libacl-devel %description gluster This package contains a FSAL shared object to @@ -332,8 +331,7 @@ rm -rf contrib/libzfswrapper %patch1 -p1 %build -%cmake ./src -DDESTDIR=%{buildroot} \ - -DCMAKE_BUILD_TYPE=Debug \ +cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \ -DBUILD_CONFIG=rpmbuild \ -DUSE_FSAL_NULL=%{use_fsal_null} \ -DUSE_FSAL_ZFS=NO \ @@ -356,7 +354,6 @@ rm -rf contrib/libzfswrapper -DUSE_DBUS=ON \ -DUSE_9P=ON \ -DDISTNAME_HAS_GIT_DATA=OFF \ - -DCMAKE_INSTALL_PREFIX= \ %if %{with jemalloc} -DALLOCATOR=jemalloc %endif @@ -369,23 +366,21 @@ mkdir -p %{buildroot}%{_sysconfdir}/dbus-1/system.d mkdir -p %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}%{_sysconfdir}/logrotate.d mkdir -p %{buildroot}%{_bindir} -ln -s %{buildroot}%{_bindir} %{buildroot}/bin -ln -s %{buildroot}%{_libdir} %{buildroot}/lib64 -ln -s %{buildroot}/usr/lib %{buildroot}/lib mkdir -p %{buildroot}%{_sbindir} mkdir -p %{buildroot}%{_libdir}/ganesha mkdir -p %{buildroot}%{_localstatedir}/run/ganesha -install -m 644 src/config_samples/logrotate_ganesha %{buildroot}%{_sysconfdir}/logrotate.d/ganesha -install -m 644 src/scripts/ganeshactl/org.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d -install -m 755 src/tools/mount.9P %{buildroot}%{_sbindir}/mount.9P +cd src +install -m 644 config_samples/logrotate_ganesha %{buildroot}%{_sysconfdir}/logrotate.d/ganesha +install -m 644 scripts/ganeshactl/org.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/dbus-1/system.d +install -m 755 tools/mount.9P %{buildroot}%{_sbindir}/mount.9P -install -m 644 src/config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 644 config_samples/vfs.conf %{buildroot}%{_sysconfdir}/ganesha %if %{with_systemd} mkdir -p %{buildroot}%{_unitdir} -install -m 644 src/scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-ganesha.service -install -m 644 src/scripts/systemd/nfs-ganesha-lock.service %{buildroot}%{_unitdir}/nfs-ganesha-lock.service -install -m 644 src/scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha +install -m 644 scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-ganesha.service +install -m 644 scripts/systemd/nfs-ganesha-lock.service %{buildroot}%{_unitdir}/nfs-ganesha-lock.service +install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha %else mkdir -p %{buildroot}%{_sysconfdir}/init.d install -m 755 scripts/init.d/nfs-ganesha %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha @@ -399,23 +394,23 @@ install -m 644 scripts/init.d/sysconfig/ganesha %{buildroot}%{_sysconfdir}/sysc %endif %if %{with pt} -install -m 644 src/config_samples/pt.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 644 config_samples/pt.conf %{buildroot}%{_sysconfdir}/ganesha %endif %if %{with xfs} -install -m 644 src/config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 644 config_samples/xfs.conf %{buildroot}%{_sysconfdir}/ganesha %endif %if %{with ceph} -install -m 644 src/config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 644 config_samples/ceph.conf %{buildroot}%{_sysconfdir}/ganesha %endif %if %{with lustre} -install -m 755 src/config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 755 config_samples/lustre.conf %{buildroot}%{_sysconfdir}/ganesha %endif %if %{with gpfs} -install -m 644 config_samples/gpfs.conf %{buildroot}%{_sysconfdir}/ganesha +install -m 644 config_samples/gpfs.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/gpfs.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/gpfs.ganesha.main.conf %{buildroot}%{_sysconfdir}/ganesha install -m 644 config_samples/gpfs.ganesha.log.conf %{buildroot}%{_sysconfdir}/ganesha @@ -427,10 +422,7 @@ install -m 755 scripts/init.d/nfs-ganesha.gpfs %{buildroot}%{_sysconfdir}/init. %endif make DESTDIR=%{buildroot} install -mv %{buildroot}/share %{buildroot}/usr/ -rm -f %{buildroot}/bin -rm -f %{buildroot}/lib -rm -f %{buildroot}/lib64 +mv %{buildroot}/usr/%{_sysconfdir}/ganesha/* %{buildroot}/%{_sysconfdir}/ganesha %post %if %{with_systemd} @@ -593,6 +585,9 @@ rm -f %{buildroot}/lib64 %endif %changelog +* Tue Oct 6 2015 Kaleb S. KEITHLEY 2.3.0-0.7rc5 +- 2.3.0 RC5 revised scripts/ganeshactl/CMakeLists.txt.patch + * Mon Oct 5 2015 Kaleb S. KEITHLEY 2.3.0-0.6rc5 - 2.3.0 RC5