up to 1.3.4

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d941be2f35061b81f6b1062347fbba87457c6387..98b10a525a9c653589b154088f75048678ea1ba9 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -2,20 +2,20 @@
 # Conditional build:
 %bcond_with    krb5            # build with MIT Kerberos instead of Heimdal
 %bcond_without tirpc           # use librpcsecgss instead of libtirpc
-#
+
 Summary:       Kernel NFS server
 Summary(pl.UTF-8):     Działający na poziomie jądra serwer NFS
 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:       1.2.8
+Version:       1.3.4
 Release:       1
 License:       GPL v2
 Group:         Networking/Daemons
-#Source0:      http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
+#Source0:      https://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
 Source0:       http://downloads.sourceforge.net/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5: 6e7d97de51e428a0b8698c16ca23db77
+# Source0-md5: 2fabdadb8ff415a1eafcfb12ab1bf781
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -30,8 +30,7 @@ Source9:      nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Source11:      blkmapd.init
 Source12:      sunrpc.conf
-Source100:     proc-fs-nfsd.mount
-Source101:     var-lib-nfs-rpc_pipefs.mount
+Source13:      %{name}_env.sh
 Source102:     nfsd.service
 Source103:     nfs-blkmapd.service
 Source104:     nfs-exportfs.service
@@ -48,6 +47,7 @@ Patch1:               %{name}-statdpath.patch
 Patch2:                %{name}-subsys.patch
 Patch3:                %{name}-union-mount.patch
 Patch4:                %{name}-heimdal.patch
+Patch5:                %{name}-x32.patch
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -63,6 +63,7 @@ BuildRequires:        libtool
 BuildRequires: libwrap-devel
 BuildRequires: pkgconfig
 BuildRequires: rpm-pythonprov
+BuildRequires: sqlite3-devel >= 3.3
 %if %{with tirpc}
 BuildRequires: libtirpc-devel >= 1:0.1.10-4
 %else
@@ -159,17 +160,17 @@ Summary(pl.UTF-8):        Wspólne programy do obsługi NFS
 Group:         Networking
 Requires(post,preun):  /sbin/chkconfig
 Requires(post,preun,postun):   systemd-units >= 38
-Provides:      user(rpcstatd)
-Provides:      group(rpcstatd)
-Provides:      nfslockd
-Provides:      nfs-utils-lock
 Requires:      libnfsidmap >= 0.25-3
 Requires:      rc-scripts
 Requires:      rpcbind >= 0.1.7
 Requires:      systemd-units >= 0.38
+Provides:      group(rpcstatd)
+Provides:      nfs-utils-lock
+Provides:      nfslockd
+Provides:      user(rpcstatd)
+Obsoletes:     knfsd-lock
 Obsoletes:     nfs-utils-common-systemd
 Obsoletes:     nfs-utils-lock
-Obsoletes:     knfsd-lock
 Obsoletes:     nfslockd
 Conflicts:     mount < 2.13-0.pre7.1
 
@@ -186,6 +187,7 @@ Wspólne programy do obsługi NFS.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 
 %build
 %{__libtoolize}
@@ -194,13 +196,13 @@ Wspólne programy do obsługi NFS.
 %{__autoheader}
 %{__automake}
 %configure \
-       --enable-nfsv3 \
        --enable-nfsv4 \
        --enable-nfsv41 \
        --enable-gss \
        --enable-mount \
        --enable-mountconfig \
        --enable-libmount-mount \
+       --enable-svcgss \
 %if %{with tirpc}
        --enable-tirpc \
        --enable-ipv6 \
@@ -238,7 +240,6 @@ cat >$RPM_BUILD_ROOT/sbin/start-statd <<EOF
 exec /sbin/rpc.statd --no-notify
 EOF
 
-%{__sed} -i -e "s|#!/bin/bash|#!/bin/sh|" $RPM_BUILD_ROOT%{_sbindir}/gss_destroy_creds
 %{__sed} -i -e 's|%{_sbindir}nfsidmap|/sbin/nfsidmap|g' $RPM_BUILD_ROOT%{_mandir}/man8/nfsidmap.8
 
 for f in rpcdebug blkmapd nfsidmap rpc.gssd rpc.idmapd rpc.statd ; do
@@ -258,8 +259,8 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 
 install %{SOURCE12} $RPM_BUILD_ROOT/etc/modprobe.d/sunrpc.conf
 
-install %{SOURCE100} $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
-install %{SOURCE101} $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
+install systemd/proc-fs-nfsd.mount $RPM_BUILD_ROOT%{systemdunitdir}/proc-fs-nfsd.mount
+install systemd/var-lib-nfs-rpc_pipefs.mount $RPM_BUILD_ROOT%{systemdunitdir}/var-lib-nfs-rpc_pipefs.mount
 install %{SOURCE102} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd.service
 install %{SOURCE103} $RPM_BUILD_ROOT%{systemdunitdir}/blkmapd.service
 install %{SOURCE104} $RPM_BUILD_ROOT%{systemdunitdir}/nfsd-exportfs.service
@@ -294,6 +295,9 @@ 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}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -411,6 +415,7 @@ fi
 %files
 %defattr(644,root,root,755)
 %doc README html
+%attr(755,root,root) /sbin/nfsdcltrack
 %attr(755,root,root) /sbin/rpcdebug
 %attr(755,root,root) /sbin/fsck.nfs
 %attr(755,root,root) %{_sbindir}/exportfs
@@ -418,7 +423,6 @@ fi
 %attr(755,root,root) %{_sbindir}/rpc.nfsd
 %attr(755,root,root) %{_sbindir}/rpc.svcgssd
 %attr(755,root,root) %{_sbindir}/nfsstat
-%attr(755,root,root) %{_sbindir}/nfsdcltrack
 
 %attr(754,root,root) /etc/rc.d/init.d/nfs
 %attr(754,root,root) /etc/rc.d/init.d/svcgssd
@@ -490,8 +494,6 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/idmapd
 %attr(754,root,root) /etc/rc.d/init.d/nfslock
 %config(noreplace) %verify(not md5 mtime size) /etc/modprobe.d/sunrpc.conf
-%attr(755,root,root) %{_sbindir}/gss_clnt_send_err
-%attr(755,root,root) %{_sbindir}/gss_destroy_creds
 %attr(755,root,root) %{_sbindir}/sm-notify
 %attr(755,root,root) /sbin/nfsidmap
 %attr(755,root,root) /sbin/rpc.idmapd