- rel 3

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d201e12137572e5c70dbcdd27ff9feecd086d48a..1930a79943b6ef9d9a8b882fe7b98b93fe2e7fe4 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,4 +1,5 @@
 # TODO
+# - consider enabling: nfsv41, mountconfig, libmount-mount
 # - should unmount /proc/fs/nfsd and /var/lib/nfs/rpc_pipefs at package
 #      uninstall (or in service nfs stop)
 #
@@ -12,12 +13,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:       1.2.2
+Version:       1.2.4
 Release:       3
 License:       GPL v2
 Group:         Networking/Daemons
 Source0:       http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
-# Source0-md5: dad92f64db3266c7757f71bb53ee8f35
+# Source0-md5: 938dc0574f3eb9891a8ed4746f806277
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -34,22 +35,21 @@ Patch0:             %{name}-install.patch
 Patch1:                %{name}-statdpath.patch
 Patch2:                %{name}-subsys.patch
 Patch3:                %{name}-union-mount.patch
-Patch4:                %{name}-kerberos-ac.patch
-Patch5:                %{name}-no_libgssapi.patch
-Patch6:                %{name}-pkgconfig_ac.patch
-Patch7:                %{name}-heimdal_functions.patch
-Patch100:      %{name}-git.patch
+Patch4:                %{name}-heimdal.patch
+Patch5:                %{name}-heimdal-kcm.patch
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
 BuildRequires: cpp
-BuildRequires: libblkid-devel
+BuildRequires: keyutils-devel
+BuildRequires: libblkid-devel >= 1.40
 BuildRequires: libcap-devel
 BuildRequires: libevent-devel >= 1.2
 BuildRequires: libnfsidmap-devel >= 0.21-3
 BuildRequires: libtool
 BuildRequires: libwrap-devel
 BuildRequires: pkgconfig
+BuildRequires: rpm-pythonprov
 %if %{with tirpc}
 BuildRequires: libtirpc-devel >= 1:0.1.10-4
 %else
@@ -169,17 +169,12 @@ Wspólne programy do obsługi NFS.
 
 %prep
 %setup -q -a1
-%patch100 -p1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%if %{without krb5}
 %patch5 -p1
-%patch6 -p1
-%patch7 -p0
-%endif
 
 %build
 %{__libtoolize}
@@ -192,19 +187,24 @@ Wspólne programy do obsługi NFS.
        --enable-nfsv4 \
        --enable-gss \
        --enable-mount \
-       --%{?with_tirpc:en}%{!?with_tirpc:dis}able-tirpc \
+%if %{with tirpc}
+       --enable-tirpc \
        --enable-ipv6 \
+%else
+       --disable-tirpc \
+       --disable-ipv6 \
+%endif
        --with-statedir=/var/lib/nfs \
        --with-statduser=rpcstatd \
        --with-start-statd=%{_sbindir}/start-statd \
        --with-tcp-wrappers \
-       --with-krb5-config=%{_bindir}/krb5-config
+       --with-krb5
 
 %{__make} all
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig} \
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/{rc.d/init.d,sysconfig,exports.d} \
        $RPM_BUILD_ROOT%{_var}/lib/nfs/{rpc_pipefs,v4recovery}
 
 %{__make} install \
@@ -345,6 +345,8 @@ fi
 %attr(754,root,root) /etc/rc.d/init.d/svcgssd
 
 %attr(664,root,fileshare) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/exports
+%dir %{_sysconfdir}/exports.d
+
 %config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/nfsd
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/xtab
 %config(noreplace) %verify(not md5 mtime size) %{_var}/lib/nfs/etab
@@ -403,6 +405,7 @@ fi
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_sbindir}/gss_clnt_send_err
 %attr(755,root,root) %{_sbindir}/gss_destroy_creds
+%attr(755,root,root) %{_sbindir}/nfsidmap
 %attr(755,root,root) %{_sbindir}/rpc.idmapd
 %attr(754,root,root) /etc/rc.d/init.d/idmapd
 %dir %{_var}/lib/nfs
@@ -410,4 +413,5 @@ fi
 %dir %{_var}/lib/nfs/v4recovery
 %{_mandir}/man5/nfs.5*
 %{_mandir}/man8/idmapd.8*
+%{_mandir}/man8/nfsidmap.8*
 %{_mandir}/man8/rpc.idmapd.8*