- put modprobe config in proper place, rel 2

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index c03a98d351ebc03aebb11bae1b1b499c3a04852e..39bde91084ca2a8a7c6de7db2374b12bb7354b29 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.5.3
+Version:       2.6.2
 Release:       2
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       https://www.kernel.org/pub/linux/utils/nfs-utils/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5: 24353242a96549fc697d25dc29a961db
+# Source0-md5: 0961dc4777363b88f10305fc4957449f
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -50,7 +50,6 @@ Patch4:               %{name}-heimdal.patch
 Patch5:                %{name}-x32.patch
 Patch6:                libnfsidmap-pluginpath.patch
 Patch7:                %{name}-sh.patch
-Patch8:                %{name}-types.patch
 URL:           http://linux-nfs.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -62,9 +61,11 @@ BuildRequires:       libcap-devel
 BuildRequires: libevent-devel >= 1.2
 BuildRequires: libmount-devel
 BuildRequires: libtool
+BuildRequires: libuuid-devel
 BuildRequires: libwrap-devel
 BuildRequires: openldap-devel
 BuildRequires: pkgconfig
+BuildRequires: rpcsvc-proto
 BuildRequires: rpm-pythonprov
 BuildRequires: rpmbuild(macros) >= 1.623
 BuildRequires: sqlite3-devel >= 3.3
@@ -234,7 +235,9 @@ Statyczna biblioteka libnfsidmap.
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
+
+# force regeneration
+%{__rm} tools/nfsrahead/99-nfs.rules
 
 %build
 %{__libtoolize}
@@ -264,6 +267,7 @@ Statyczna biblioteka libnfsidmap.
        --without-gssglue \
        --with-krb5 \
        --with-systemd=%{systemdunitdir} \
+       --with-modprobedir=/lib/modprobe.d \
        --with-tcp-wrappers
 
 %{__make} pkgplugindir=/%{_lib}/libnfsidmap
@@ -278,7 +282,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}
@@ -549,7 +554,10 @@ 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/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 +582,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
@@ -584,6 +593,7 @@ fi
 %attr(600,rpcstatd,rpcstatd) %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/statd/state
 %attr(755,root,root) /lib/systemd/system-generators/nfs-server-generator
 %attr(755,root,root) /lib/systemd/system-generators/rpc-pipefs-generator
+/lib/modprobe.d/50-nfs.conf
 %{systemdunitdir}/idmapd.service
 %{systemdunitdir}/nfslock.service
 %{systemdunitdir}/rpc_pipefs.target
@@ -597,6 +607,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*