diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index ffee1b5..29a600e 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -73,25 +73,22 @@ %bcond_without gui_utils %global use_gui_utils %{on_off_switch gui_utils} -%bcond_with ntirpc -%global use_ntirpc %{on_off_switch ntirpc} +%bcond_without system_ntirpc +%global use_system_ntirpc %{on_off_switch system_ntirpc} -%global dev_version %{lua: extraver = string.gsub('-rc5', '%-', ''); print(extraver) } +%global dev_version %{lua: extraver = string.gsub('-rc6', '%-', ''); print(extraver) } -%global versiontag 2.3-rc5 +%global versiontag 2.3-rc6 Name: nfs-ganesha Version: 2.3.0 -Release: 0.9%{?dev_version:%{dev_version}}%{?dist} +Release: 0.10%{?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 -Patch0: nfs-ganesha-2.3rc5-CMakeLists.txt.patch -Patch1: nfs-ganesha-2.3rc5-scripts-ganeshactl-CMakeLists.txt.patch -Patch2: nfs-ganesha-2.3rc5-include-config-h.in.cmake.patch BuildRequires: cmake BuildRequires: bison @@ -102,7 +99,7 @@ BuildRequires: dbus-devel BuildRequires: libcap-devel BuildRequires: libblkid-devel BuildRequires: libuuid-devel -%if ! %{with ntirpc} +%if %{with system_ntirpc} BuildRequires: libntirpc-devel >= 1.3.0 %endif Requires: dbus @@ -329,9 +326,6 @@ be used with NFS-Ganesha to support Gluster %prep %setup -q -n %{name}-%{versiontag} rm -rf contrib/libzfswrapper -%patch0 -p1 -%patch1 -p1 -%patch2 -p1 %build cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \ @@ -347,6 +341,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \ -DUSE_FSAL_PANFS=%{use_fsal_panfs} \ -DUSE_FSAL_PT=%{use_fsal_pt} \ -DUSE_FSAL_GLUSTER=%{use_fsal_gluster} \ + -DUSE_SYSTEM_NTIRPC=%{use_system_ntirpc} \ -DUSE_9P_RDMA=%{use_rdma} \ -DUSE_FSAL_LUSTRE_UP=%{use_lustre_up} \ -DUSE_LTTNG=%{use_lttng} \ @@ -446,7 +441,7 @@ make DESTDIR=%{buildroot} install %license src/LICENSE.txt %defattr(-,root,root,-) %{_bindir}/ganesha.nfsd -%if %{with ntirpc} +%if ! %{with system_ntirpc} %{_libdir}/libntirpc.so.1.3.0 %{_libdir}/libntirpc.so.1.3 %{_libdir}/libntirpc.so @@ -587,6 +582,9 @@ make DESTDIR=%{buildroot} install %endif %changelog +* Mon Oct 12 2015 Kaleb S. KEITHLEY 2.3.0-0.10rc6 +- 2.3.0 RC6 + * Thu Oct 8 2015 Kaleb S. KEITHLEY 2.3.0-0.9rc5 - 2.3.0 RC5 w/ CMakeLists.txt.patch and config-h.in.cmake.patch diff --git a/sources b/sources index ed18fe5..7fb2383 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0a66bbe84da1c694d1d502669e85ff99 nfs-ganesha-2.3-rc5.tar.gz +0783c488e81906f28dcf67f5f9d0b029 nfs-ganesha-2.3-rc6.tar.gz