- fix without nfs4

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index bc27f4e9a9ef17ab6015448ae7a79e4647fcc049..a51030fb9696a0970e84aea3a5b5bf9f30ecffab 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -13,13 +13,13 @@ Summary(ru.UTF-8):  Утилиты для NFS и демоны поддержки
 Summary(uk.UTF-8):     Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:          nfs-utils
 Version:       1.1.0
-%define        _pre    rc1
-Release:       0.%{_pre}.1
+Release:       2
 License:       GPL
 Group:         Networking/Daemons
-Source0:       http://dl.sourceforge.net/nfs/%{name}-%{version}-%{_pre}.tar.gz
-# Source0-md5: 924dd05dc3958d4da585d74808bb84c4
-Source1:       ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
+Source0:       ftp://ftp.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.gz
+# Source0-md5: df88c6fe88a26f9797e74cb2d3291a2a
+#Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
+Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
 Source2:       nfs.init
 Source3:       nfslock.init
@@ -32,8 +32,7 @@ Source9:      nfslock.sysconfig
 Source10:      nfsfs.sysconfig
 Patch0:                %{name}-eepro-support.patch
 Patch1:                %{name}-install.patch
-# http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/
-#Patch2:               %{name}-1.0.11-CITI_NFS4_ALL-1.dif
+# http://www.citi.umich.edu/projects/nfsv4/linux/nfs-utils-patches/1.1.0-1/nfs-utils-1.1.0-CITI_NFS4_ALL-1.dif
 Patch2:                %{name}-CITI_NFS4.patch
 Patch3:                %{name}-statdpath.patch
 Patch4:                %{name}-mount-fake.patch
@@ -41,6 +40,7 @@ Patch5:               %{name}-mountd.patch
 Patch6:                %{name}-idmapd.conf.patch
 Patch7:                %{name}-keytab-path.patch
 Patch8:                %{name}-subsys.patch
+Patch9:                %{name}-mountd-leak.patch
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -61,7 +61,7 @@ Requires(post):       sed >= 4.0
 Requires(post,preun):  /sbin/chkconfig
 Requires:      %{name}-common = %{version}-%{release}
 Requires:      portmap >= 4.0
-Requires:      rc-scripts >= 0.4.0
+Requires:      rc-scripts >= 0.4.1.5
 Requires:      setup >= 2.4.6-7
 Provides:      nfsdaemon
 Obsoletes:     knfsd
@@ -157,7 +157,7 @@ Common programs for NFS.
 Wspólne programy do obsługi NFS.
 
 %prep
-%setup -q -a1 -n %{name}-%{version}-%{_pre}
+%setup -q -a1
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -167,6 +167,7 @@ Wspólne programy do obsługi NFS.
 %patch6 -p1
 %patch7 -p1
 %patch8 -p1
+%patch9 -p1
 
 %build
 %configure \
@@ -222,12 +223,13 @@ install %{SOURCE10} $RPM_BUILD_ROOT/etc/sysconfig/nfsfs
 > $RPM_BUILD_ROOT%{_var}/lib/nfs/rmtab
 > $RPM_BUILD_ROOT%{_sysconfdir}/exports
 
-rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,svcgssd,gssd,idmapd,sm-notify}.8
+rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{mountd,nfsd,statd,sm-notify}.8
 echo ".so mountd.8"  >         $RPM_BUILD_ROOT%{_mandir}/man8/rpc.mountd.8
 echo ".so nfsd.8"    > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.nfsd.8
 echo ".so statd.8"   > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.statd.8
 echo ".so sm-notify.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.sm-notify.8
 %if %{with nfs4}
+rm $RPM_BUILD_ROOT%{_mandir}/man8/rpc.{svcgssd,gssd,idmapd.8
 echo ".so gssd.8"    > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.gssd.8
 echo ".so idmapd.8"  > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.idmapd.8
 echo ".so svcgssd.8" > $RPM_BUILD_ROOT%{_mandir}/man8/rpc.svcgssd.8