- updated to 2.5.4

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index 03c6ce55afb7249cb6953bdff8868d0e08694d3e..ee6cc7918286b58ccd98c0f43ebc7799e63616cf 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.4.3
-Release:       2
+Version:       2.5.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: 06020c76f531ed97f3145514901e0e7c
+# Source0-md5: 7e330130ac9677c34bba5ab512036bef
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -95,7 +95,7 @@ Requires:     systemd-units >= 0.38
 Provides:      nfsdaemon
 Obsoletes:     knfsd
 Obsoletes:     nfs-server
-Obsoletes:     nfs-utils-systemd
+Obsoletes:     nfs-utils-systemd < 1.2.5-5
 Obsoletes:     nfsdaemon
 Conflicts:     kernel < 2.2.5
 Conflicts:     krb5-common < 1.7
@@ -141,7 +141,7 @@ Provides:   nfs-server-clients
 Provides:      nfsclient
 Obsoletes:     knfsd-clients
 Obsoletes:     nfs-server-clients
-Obsoletes:     nfs-utils-clients-systemd
+Obsoletes:     nfs-utils-clients-systemd < 1.2.5-5
 Obsoletes:     nfsclient
 Conflicts:     krb5-common < 1.7
 
@@ -174,8 +174,8 @@ Provides:   nfs-utils-lock
 Provides:      nfslockd
 Provides:      user(rpcstatd)
 Obsoletes:     knfsd-lock
-Obsoletes:     nfs-utils-common-systemd
-Obsoletes:     nfs-utils-lock
+Obsoletes:     nfs-utils-common-systemd < 1.2.5-5
+Obsoletes:     nfs-utils-lock < 1.2.5-3
 Obsoletes:     nfslockd
 Conflicts:     mount < 2.13-0.pre7.1
 
@@ -190,7 +190,7 @@ Summary:    Library to help mapping id's, mainly for NFSv4
 Summary(pl.UTF-8):     Biblioteka pomagająca w mapowaniu identyfikatorów, głównie dla NFSv4
 License:       BSD
 Group:         Libraries
-Obsoletes:     nfsidmap
+Obsoletes:     nfsidmap < 0.12
 
 %description -n libnfsidmap
 Library to help mapping id's, mainly for NFSv4.
@@ -203,7 +203,7 @@ Summary:    Header files for libnfsidmap library
 Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki libnfsidmap
 Group:         Development/Libraries
 Requires:      libnfsidmap = %{version}-%{release}
-Obsoletes:     nfsidmap-devel
+Obsoletes:     nfsidmap-devel < 0.12
 
 %description -n libnfsidmap-devel
 Header files for libnfsidmap library.
@@ -216,7 +216,7 @@ Summary:    Static libnfsidmap library
 Summary(pl.UTF-8):     Statyczna biblioteka libnfsidmap
 Group:         Development/Libraries
 Requires:      libnfsidmap-devel = %{version}-%{release}
-Obsoletes:     nfsidmap-static
+Obsoletes:     nfsidmap-static < 0.12
 
 %description -n libnfsidmap-static
 Static libnfsidmap library.
@@ -283,7 +283,7 @@ install -d $RPM_BUILD_ROOT/etc/{rc.d/init.d,sysconfig,exports.d,modprobe.d} \
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.la
 %{__rm} $RPM_BUILD_ROOT/%{_lib}/libnfsidmap/*.{a,la}
 
-mv -f $RPM_BUILD_ROOT%{_libdir}/libnfsidmap.so.* $RPM_BUILD_ROOT/%{_lib}
+%{__mv} $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
 
@@ -363,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
@@ -485,9 +485,10 @@ fi
 %attr(755,root,root) /sbin/nfsdcltrack
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
-%attr(755,root,root) %{_sbindir}/clddb-tool
 %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
@@ -508,11 +509,12 @@ fi
 %{_mandir}/man5/nfs.conf.5*
 %{_mandir}/man7/nfsd.7*
 %{_mandir}/man7/nfs.systemd.7*
-%{_mandir}/man8/clddb-tool.8*
 %{_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*
@@ -605,6 +607,7 @@ fi
 %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) /%{_lib}/libnfsidmap/umich_ldap.so