- updated to 1.1.1

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

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d6332936d6621d02882c66d732e3a2f77b697389..672e69997b9738d7d6aad8b422f7a3e5a74fecd2 100644 (file)
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -12,13 +12,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.1.0
-%define        _pre    rc2
-Release:       0.%{_pre}.1
+Version:       1.1.1
+Release:       1
 License:       GPL
 Group:         Networking/Daemons
-Source0:       ftp://ftp.kernel.org/pub/linux/utils/nfs/%{name}-%{version}-%{_pre}.tar.gz
-# Source0-md5: 79125d8c058122611d1ef267c6498c4b
+Source0:       ftp://ftp.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.gz
+# Source0-md5: 407785488241f9db67b1874e3f36370e
 #Source1:      ftp://ftp.linuxnfs.sourceforge.org/pub/nfs/nfs.doc.tar.gz
 Source1:       nfs.doc.tar.gz
 # Source1-md5: ae7db9c61c5ad04f83bb99e5caed73da
@@ -33,15 +32,13 @@ 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.1-1/nfs-utils-1.1.1-CITI_NFS4_ALL-1.dif
 Patch2:                %{name}-CITI_NFS4.patch
 Patch3:                %{name}-statdpath.patch
-Patch4:                %{name}-mount-fake.patch
-Patch5:                %{name}-mountd.patch
-Patch6:                %{name}-idmapd.conf.patch
-Patch7:                %{name}-keytab-path.patch
-Patch8:                %{name}-subsys.patch
+Patch4:                %{name}-mountd.patch
+Patch5:                %{name}-idmapd.conf.patch
+Patch6:                %{name}-keytab-path.patch
+Patch7:                %{name}-subsys.patch
 URL:           http://nfs.sourceforge.net/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake
@@ -50,8 +47,9 @@ BuildRequires:        e2fsprogs-devel >= 1.39-5
 %if %{with nfs4}
 BuildRequires: krb5-devel >= 1.6
 BuildRequires: libevent-devel >= 1.2
+BuildRequires: libgssglue-devel >= 0.1
 BuildRequires: libnfsidmap-devel
-BuildRequires: librpcsecgss-devel >= 0.11-3
+BuildRequires: librpcsecgss-devel >= 0.16
 %endif
 BuildRequires: libtool
 BuildRequires: libwrap-devel
@@ -158,19 +156,18 @@ 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
-# severly out of date
-#%patch2 -p1
+%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
 %patch7 -p1
-%patch8 -p1
 
 %build
+%{__autoconf}
 %configure \
 %if %{with nfs4}
        --enable-gss \
@@ -181,7 +178,6 @@ Wspólne programy do obsługi NFS.
        --disable-nfsv4 \
 %endif
        %{?with_mount:--enable-mount} \
-       --disable-rquotad \
        --enable-nfsv3 \
        --enable-secure-statd \
        --with-statedir=/var/lib/nfs \
@@ -224,12 +220,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