]> git.pld-linux.org Git - packages/nfs-utils.git/blobdiff - nfs-utils.spec
projects / packages / nfs-utils.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
- updated to 2.6.4
[packages/nfs-utils.git] / nfs-utils.spec
diff --git a/nfs-utils.spec b/nfs-utils.spec
index df916620ed0fdfc63aaba7757fde1ae4a1382716..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.4.2
-Release:       4
+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: d427c6b3014e9a04e8498f0598b1c1b9
+# Source0-md5: 907f95977ccf7a522ee32af1534f0e4c
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -49,7 +49,7 @@ Patch3:               %{name}-union-mount.patch
 Patch4:                %{name}-heimdal.patch
 Patch5:                %{name}-x32.patch
 Patch6:                libnfsidmap-pluginpath.patch
-Patch7:                %{name}-types.patch
+Patch7:                %{name}-sh.patch
 URL:           http://linux-nfs.org/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -61,13 +61,18 @@ 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
+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
@@ -76,7 +81,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
@@ -92,7 +96,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
@@ -131,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
@@ -138,7 +147,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
 
@@ -171,8 +180,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
 
@@ -187,7 +196,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.
@@ -200,7 +209,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.
@@ -213,7 +222,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.
@@ -232,6 +241,9 @@ Statyczna biblioteka libnfsidmap.
 %patch6 -p1
 %patch7 -p1
 
+# force regeneration
+%{__rm} tools/nfsrahead/99-nfs.rules
+
 %build
 %{__libtoolize}
 %{__aclocal} -I aclocal
@@ -274,12 +286,13 @@ 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}
 
-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
 
@@ -325,7 +338,7 @@ 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
@@ -359,7 +372,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
@@ -478,12 +491,14 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README html
-%attr(755,root,root) /sbin/nfsdcld
 %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}/fsidd
+%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
@@ -504,11 +519,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*
@@ -517,10 +533,12 @@ fi
 %{_mandir}/man8/rpcdebug.8*
 %{_mandir}/man8/svcgssd.8*
 
+%{systemdunitdir}/fsidd.service
 %{systemdunitdir}/nfs.service
 %{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
@@ -542,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*
@@ -567,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
@@ -590,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*
 
@@ -600,6 +624,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
Kernel NFS server
This page took 0.136477 seconds and 4 git commands to generate.