diff --git a/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch b/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch new file mode 100644 index 0000000..69b68ff --- /dev/null +++ b/nfs-ganesha-2.1.0-support-CMakeLists.txt.patch @@ -0,0 +1,19 @@ +*** nfs-ganesha-2.1.0/src/support/CMakeLists.txt.orig 2014-07-01 11:06:16.219133273 -0400 +--- nfs-ganesha-2.1.0/src/support/CMakeLists.txt 2014-07-01 11:05:03.312133273 -0400 +*************** +*** 33,39 **** + uid2grp_cache.c + ) + +! add_library( uid2grp ${uid2grp_SRCS} ) + + ########### next target ############### + +--- 33,39 ---- + uid2grp_cache.c + ) + +! add_library( uid2grp STATIC ${uid2grp_SRCS} ) + + ########### next target ############### + diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index fdf17a9..88e48e0 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -19,7 +19,7 @@ Name: nfs-ganesha Version: 2.1.0 -Release: 2%{?prereltag:.%{prereltag}}%{?dist} +Release: 3%{?prereltag:.%{prereltag}}%{?dist} Summary: Ganesha NFS Server Group: System Environment/Libraries License: LGPLv3+ @@ -39,6 +39,7 @@ Patch8: nfs-ganesha-2.1.0-nfs4_pseudo.patch Patch9: nfs-ganesha-2.1.0-config-h.in.cmake.patch Patch10: nfs-ganesha-2.1.0-commonlib.patch Patch11: nfs-ganesha-2.1.0-nfs4_op_secinfo.patch +Patch12: nfs-ganesha-2.1.0-support-CMakeLists.txt.patch %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} @@ -162,6 +163,7 @@ mv %{ntirpcname}-%{ntirpcvers}/* src/libntirpc/ %patch9 -p1 %patch10 -p1 %patch11 -p1 +%patch12 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 7 ) @@ -183,7 +185,6 @@ install -D -p -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/nfs-ganesha.service install -D -p -m 0744 %{SOURCE3} %{buildroot}%{_sysconfdir}/init.d/nfs-ganesha install -D -p -m 0744 %{SOURCE4} %{buildroot}%{_sbindir}/nfs_ganesha.sh %endif -install -p -m 0755 support/libuid2grp.so %{buildroot}%{_libdir} %post /sbin/ldconfig @@ -242,6 +243,9 @@ install -p -m 0755 support/libuid2grp.so %{buildroot}%{_libdir} %dir %{_pkgdocdir} %changelog +* Tue Jul 1 2014 Kaleb S. KEITHLEY 2.1.0-3 +- static libuid2grp + * Tue Jul 1 2014 Kaleb S. KEITHLEY 2.1.0-2 - add libuid2grp.so