- updated to 2.6.4

[packages/nfs-utils.git] / nfs-utils.spec

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 39127b1c46bbe8728982c5e621b82927e31022c3..29312bed2e6161602a5397e6473c3430cf66439d 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -10,12 +10,12 @@ Summary(pt_BR.UTF-8):       Os utilitários para o cliente e servidor NFS do Linux
 Summary(ru.UTF-8):     Утилиты для NFS и демоны поддержки для NFS-сервера ядра
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils
-Version:       2.6.1
+Version:       2.6.4
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 43445a3563185963b736a7081979fd08
+# Source0-md5: 907f95977ccf7a522ee32af1534f0e4c
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -72,7 +72,7 @@ BuildRequires:        sqlite3-devel >= 3.3
 BuildRequires: tar >= 1:1.22
 BuildRequires: xz
 %if %{with tirpc}
-BuildRequires: libtirpc-devel >= 1:0.1.10-4
+BuildRequires: libtirpc-devel >= 1:1.3.4
 %else
 BuildRequires: librpcsecgss-devel >= 0.16
 %endif
@@ -135,6 +135,11 @@ Group:             Networking
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,preun,postun):   systemd-units >= 38
 Requires:      %{name}-common = %{version}-%{release}
+%if %{with tirpc}
+Requires:      libtirpc >= 1:1.3.4
+%else
+BuildRequires: librpcsecgss >= 0.16
+%endif
 Requires:      psmisc
 Requires:      rc-scripts
 Requires:      systemd-units >= 0.38
@@ -236,6 +241,9 @@ Statyczna biblioteka libnfsidmap.
 %patch6 -p1
 %patch7 -p1
 
+# force regeneration
+%{__rm} tools/nfsrahead/99-nfs.rules
+
 %build
 %{__libtoolize}
 %{__aclocal} -I aclocal
@@ -278,7 +286,8 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,exports.d,modprobe.d} \
 %{__make} install \
        DESTDIR=$RPM_BUILD_ROOT \
        pkgplugindir=/%{_lib}/libnfsidmap \
-       generator_dir=/lib/systemd/system-generators
+       generator_dir=/lib/systemd/system-generators \
+       udev_rulesdir=/lib/udev/rules.d
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.la
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/libnfsidmap/*.{a,la}
@@ -486,6 +495,7 @@ fi
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs
+%attr(755,root,root) %{_sbindir}/fsidd
 %attr(755,root,root) %{_sbindir}/nfsdcld
 %attr(755,root,root) %{_sbindir}/nfsdclddb
 %attr(755,root,root) %{_sbindir}/nfsdclnts
@@ -523,6 +533,7 @@ fi
 %{_mandir}/man8/rpcdebug.8*
 %{_mandir}/man8/svcgssd.8*
 
+%{systemdunitdir}/fsidd.service
 %{systemdunitdir}/nfs.service
 %{systemdunitdir}/nfsd.service
 %{systemdunitdir}/nfsd-exportfs.service
@@ -549,7 +560,11 @@ fi
 %attr(755,root,root) %{_sbindir}/mountstats
 %attr(755,root,root) %{_sbindir}/nfsiostat
 %attr(755,root,root) %{_sbindir}/showmount
+%attr(755,root,root) %{_libexecdir}/nfsrahead
+/lib/udev/rules.d/60-nfs.rules
+/lib/udev/rules.d/99-nfs.rules
 %{_mandir}/man5/nfsmount.conf.5*
+%{_mandir}/man5/nfsrahead.5*
 %{_mandir}/man8/blkmapd.8*
 %{_mandir}/man8/gssd.8*
 %{_mandir}/man8/mount.nfs.8*
@@ -574,6 +589,7 @@ fi
 %attr(755,root,root) /sbin/rpc.statd
 %attr(755,root,root) /sbin/start-statd
 %attr(755,root,root) %{_sbindir}/nfsconf
+%attr(755,root,root) %{_sbindir}/rpcctl
 %attr(755,root,root) %{_sbindir}/sm-notify
 %dir %{_var}/lib/nfs
 %dir %{_var}/lib/nfs/rpc_pipefs
@@ -597,6 +613,7 @@ fi
 %{_mandir}/man8/rpc.idmapd.8*
 %{_mandir}/man8/rpc.sm-notify.8*
 %{_mandir}/man8/rpc.statd.8*
+%{_mandir}/man8/rpcctl.8*
 %{_mandir}/man8/sm-notify.8*
 %{_mandir}/man8/statd.8*