- updated to 2.5.1

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 35517b70ac5e666744afe2b8768194eb2b2f28db..64fdbe46eb89029e7e1cccae5c155839e78f66ee 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.3.3
+Version:       2.5.1
 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: b6c9c032995af1c08fea9fbcc1ce33e9
+# Source0-md5: d14294d5efcd9aada28f4dab871a44a6
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -48,6 +48,9 @@ Patch2:               %{name}-subsys.patch
 Patch3:                %{name}-union-mount.patch
 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
@@ -63,7 +66,10 @@ BuildRequires:       libwrap-devel
 BuildRequires: openldap-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
+BuildRequires: rpmbuild(macros) >= 1.623
 BuildRequires: sqlite3-devel >= 3.3
+BuildRequires: tar >= 1:1.22
+BuildRequires: xz
 %if %{with tirpc}
 BuildRequires: libtirpc-devel >= 1:0.1.10-4
 %else
@@ -74,7 +80,6 @@ BuildRequires:        krb5-devel >= 1.6
 %else
 BuildRequires: heimdal-devel >= 1.0
 %endif
-BuildRequires: rpmbuild(macros) >= 1.623
 # lucid context fields mismatch with current version of spkm3.h
 BuildConflicts:        gss_mech_spkm3-devel
 Requires(post):        fileutils
@@ -227,6 +232,9 @@ Statyczna biblioteka libnfsidmap.
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
 
 %build
 %{__libtoolize}
@@ -258,7 +266,7 @@ Statyczna biblioteka libnfsidmap.
        --with-systemd=%{systemdunitdir} \
        --with-tcp-wrappers
 
-%{__make}
+%{__make} pkgplugindir=/%{_lib}/libnfsidmap
 # all
 
 %install
@@ -269,12 +277,17 @@ 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
 
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap/*.la
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap/*.a
+%{__rm} $RPM_BUILD_ROOT/%{_lib}/libnfsidmap/*.{a,la}
+
+mv -f $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so.* $RPM_BUILD_ROOT/%{_lib}
+ln -sf /%{_lib}/$(basename $RPM_BUILD_ROOT/%{_lib}/libnfsidmap.so.*.*.*) \
+       $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so
 
+install -p support/nfsidmap/idmapd.conf $RPM_BUILD_ROOT%{_sysconfdir}
 install -p utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc
 
 %{__rm} $RPM_BUILD_ROOT%{_sbindir}/start-statd
@@ -316,12 +329,13 @@ install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
 install %{SOURCE105} $RPM_BUILD_ROOT%{systemdunitdir}/gssd.service
 # TODO: upstream installs nfs-idmapd.service
 install %{SOURCE106} $RPM_BUILD_ROOT%{systemdunitdir}/idmapd.service
-# TODO: upstream installs rpc-statd.service + nfs-statd-notify.service
+# TODO: upstream installs rpc-statd.service + rpc-statd-notify.service
 install %{SOURCE107} $RPM_BUILD_ROOT%{systemdunitdir}/nfslock.service
 # TODO: upstream installs nfs-mountd.service
 install %{SOURCE108} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-mountd.service
-# TODO: upstream installs auth-rpcgss-module.service / nfs-svcgssd.service
+# TODO: upstream installs auth-rpcgss-module.service / rpc-svcgssd.service
 install %{SOURCE109} $RPM_BUILD_ROOT%{systemdunitdir}/svcgssd.service
+# TODO: upstream installs also nfs-utils.service and nfs-client.target meta-services
 install %{SOURCE110} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.postconfig
 install %{SOURCE111} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfsd.preconfig
 install %{SOURCE112} $RPM_BUILD_ROOT%{_datadir}/nfs-utils/nfslock.preconfig
@@ -349,7 +363,7 @@ ln -sf /bin/true $RPM_BUILD_ROOT/sbin/fsck.nfs
 cp -a nfs html
 
 # make python dep optional
-chmod a-x $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat}
+chmod a-x $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsdclddb,nfsdclnts,nfsiostat}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -472,6 +486,9 @@ 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}/nfsdcld
+%attr(755,root,root) %{_sbindir}/nfsdclddb
+%attr(755,root,root) %{_sbindir}/nfsdclnts
 %attr(755,root,root) %{_sbindir}/rpc.mountd
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
 %attr(755,root,root) %{_sbindir}/rpc.svcgssd
@@ -495,6 +512,9 @@ fi
 %{_mandir}/man8/exportfs.8*
 %{_mandir}/man8/mountd.8*
 %{_mandir}/man8/nfsd.8*
+%{_mandir}/man8/nfsdcld.8*
+%{_mandir}/man8/nfsdclddb.8*
+%{_mandir}/man8/nfsdclnts.8*
 %{_mandir}/man8/nfsdcltrack.8*
 %{_mandir}/man8/nfsstat.8*
 %{_mandir}/man8/rpc.mountd.8*
@@ -507,6 +527,7 @@ fi
 %{systemdunitdir}/nfsd.service
 %{systemdunitdir}/nfsd-exportfs.service
 %{systemdunitdir}/nfsd-mountd.service
+%{systemdunitdir}/nfsdcld.service
 %{systemdunitdir}/svcgssd.service
 %{systemdunitdir}/proc-fs-nfsd.mount
 %attr(755,root,root) %{_datadir}/nfs-utils/nfsd.postconfig
@@ -524,7 +545,6 @@ fi
 %attr(4755,root,root) /sbin/mount.nfs4
 %attr(4755,root,root) /sbin/umount.nfs4
 %attr(755,root,root) /sbin/blkmapd
-%attr(755,root,root) /sbin/osd_login
 %attr(755,root,root) /sbin/rpc.gssd
 %attr(755,root,root) %{_sbindir}/mountstats
 %attr(755,root,root) %{_sbindir}/nfsiostat
@@ -582,16 +602,17 @@ fi
 
 %files -n libnfsidmap
 %defattr(644,root,root,755)
-#%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
-%attr(755,root,root) %{_libdir}/libnfsidmap.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libnfsidmap.so.1
-%dir %{_libdir}/libnfsidmap
-%attr(755,root,root) %{_libdir}/libnfsidmap/nsswitch.so
-%attr(755,root,root) %{_libdir}/libnfsidmap/static.so
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/idmapd.conf
+%attr(755,root,root) /%{_lib}/libnfsidmap.so.*.*.*
+%attr(755,root,root) %ghost /%{_lib}/libnfsidmap.so.1
+%dir /%{_lib}/libnfsidmap
+%attr(755,root,root) /%{_lib}/libnfsidmap/nsswitch.so
+%attr(755,root,root) /%{_lib}/libnfsidmap/regex.so
+%attr(755,root,root) /%{_lib}/libnfsidmap/static.so
 # -plugin-ldap subpackage?
-%attr(755,root,root) %{_libdir}/libnfsidmap/umich_ldap.so
+%attr(755,root,root) /%{_lib}/libnfsidmap/umich_ldap.so
 # -plugin-gums subpackage (BR: some datagrid software - VOMS?)
-#%attr(755,root,root) %{_libdir}/libnfsidmap/gums.so
+#%attr(755,root,root) /%{_lib}/libnfsidmap/gums.so
 %{_mandir}/man5/idmapd.conf.5*
 
 %files -n libnfsidmap-devel