nfs-utils: update to 1.2.5

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5512 ec354946-7b23-47d6-9f5a-488ba84defc7

n/nfs-utils/nfs-utils-vl.spec

@@ -2,43 +2,33 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
 Summary(ja): カーネル NFS サーバ用 NFS ユーティリティと関連プログラム
 Name: nfs-utils
 URL: http://sourceforge.net/projects/nfs
-Version: 1.1.5
-Release: 5%{?_dist_release}
+Version: 1.2.5
+Release: 1%{?_dist_release}
+
+%define enablegss 0
 
 # group all 32bit related archs
 %define all_32bit_archs i386 i686 athlon
 
-# Enable the ability to set the 'fsc' mount flag which
-# will allow NFS to use FS-Cache.
-%define enablefscache 0
-
-# Set 1 to enable RPC Sec-GSS authentication feature
-%define enablegss 0
-
 Source0: http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
 Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.gz
 
 Source10: nfs.init
 Source11: nfslock.init
 Source12: rpcidmapd.init
+%if %{enablegss}
 Source13: rpcgssd.init
 Source14: rpcsvcgssd.init
+%endif
 Source15: nfs.sysconfig
 
+Patch001: nfs-utils-1.2.6-rc6.patch
+Patch002: nfs-utils-1.2.4-mountshortcut.patch
 
-Patch00: nfs-utils-1.0.5-statdpath.patch
-Patch01: nfs-utils-1.1.0-smnotify-path.patch
-Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
-
-Patch100: nfs-utils-1.1.5-tcpwrap-externs.patch
-Patch101: nfs-utils-1-1-6-rc2.patch
-Patch102: nfs-utils-1-1-6-rc3.patch
-Patch103: nfs-utils-1.1.5-nfsstat-update.patch
-Patch104: nfs-utils-1.1.5-umount-privport.patch
-
-%if %{enablefscache}
-Patch90: nfs-utils-1.1.0-mount-fsc.patch
-%endif
+Patch100: nfs-utils-1.2.1-statdpath-man.patch
+Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
+Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
+Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{version}-%{release}
@@ -71,12 +61,14 @@ BuildRequires: libevent-devel >= 1.3b
 BuildRequires: libnfsidmap >= 0.20
 BuildRequires: libblkid-devel
 %if %{enablegss}
-BuildRequires: libgssglue-devel
+BuildRequires: libgssglue-devel >= 0.3
 BuildRequires: librpcsecgss >= 0.17
 %endif
 BuildRequires: autoconf >= 2.57 openldap-devel >= 2.2
 BuildRequires: automake, libtool, glibc-headers
 BuildRequires: e2fsprogs-devel, tcp_wrappers
+BuildRequires: libtirpc-devel
+BuildRequires: device-mapper-devel
 Requires(pre): shadow-utils >= 4.0.3-25
 Requires(pre): /sbin/chkconfig /sbin/nologin
 Requires: libnfsidmap >= 0.20 libevent >= 1.3b
@@ -113,19 +105,15 @@ NFS サーバに関する情報を得ることができます。
 
 %prep
 %setup -q
-%patch00 -p1
-%patch01 -p1
-%patch02 -p1
+
+%patch001 -p1
+%patch002 -p1
 
 %patch100 -p1
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
-%patch104 -p1
 
-%if %{enablefscache}
-%patch90 -p1
-%endif
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
@@ -142,16 +130,17 @@ export PIE
 
 sh -x autogen.sh
 
-CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE`"
+CFLAGS="`echo $RPM_OPT_FLAGS $ARCH_OPT_FLAGS $PIE -D_FILE_OFFSET_BITS=64`"
 %configure \
     CFLAGS="$CFLAGS" \
     CPPFLAGS="$DEFINES" \
     LDFLAGS="-pie" \
-%if %{enablegss}
-    --enable-gss \
-%else
+    --enable-mountconfig \
+    --enable-ipv6 \
+    --with-statdpath=/var/lib/nfs/statd \
+%if !%{enablegss}
     --disable-gss \
-%endif
+%endif    
     --enable-mount
 
 make all
@@ -162,8 +151,10 @@ rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT{/sbin,/usr/sbin}
 mkdir -p ${RPM_BUILD_ROOT}%{_mandir}/{man5,man8}
 mkdir -p $RPM_BUILD_ROOT{/etc/rc.d/init.d,/etc/sysconfig}
+mkdir -p $RPM_BUILD_ROOT/etc/request-key.d
 make DESTDIR=$RPM_BUILD_ROOT install
 install -s -m 755 tools/rpcdebug/rpcdebug $RPM_BUILD_ROOT/usr/sbin
+install -m 644 utils/mount/nfsmount.conf  $RPM_BUILD_ROOT/etc
 install -m 755 %{SOURCE10} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfs
 install -m 755 %{SOURCE11} $RPM_BUILD_ROOT/etc/rc.d/init.d/nfslock
 install -m 755 %{SOURCE12} $RPM_BUILD_ROOT/etc/rc.d/init.d/rpcidmapd
@@ -179,7 +170,9 @@ touch $RPM_BUILD_ROOT/var/lib/nfs/rmtab
 mv $RPM_BUILD_ROOT/usr/sbin/rpc.statd $RPM_BUILD_ROOT/sbin
 
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm
+mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/statd/sm.bak
 mkdir -p $RPM_BUILD_ROOT/var/lib/nfs/v4recovery
+mkdir -p $RPM_BUILD_ROOT/etc/exports.d
 
 # temporarily remove nfs.5 man page until util-linux gets upgraded...
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man5/nfs.5*
@@ -236,8 +229,8 @@ if [ "$1" = "0" ]; then
     /etc/rc.d/init.d/nfs condrestart
 %if %{enablegss}
     /etc/rc.d/init.d/rpcgssd condrestart
+%endif    
     /etc/rc.d/init.d/rpcidmapd condrestart
-%endif
     /etc/rc.d/init.d/nfslock condrestart
     /sbin/chkconfig --del rpcidmapd
 %if %{enablegss}
@@ -274,6 +267,7 @@ fi
 
 %files
 %defattr(-,root,root)
+%doc linux-nfs/*
 %config /etc/rc.d/init.d/nfs
 %config /etc/rc.d/init.d/rpcidmapd
 %if %{enablegss}
@@ -281,16 +275,18 @@ fi
 %config /etc/rc.d/init.d/rpcsvcgssd
 %endif
 %config(noreplace) /etc/sysconfig/nfs
+%config(noreplace) /etc/nfsmount.conf
+%dir /etc/exports.d
 %dir /var/lib/nfs/v4recovery
 %dir /var/lib/nfs/rpc_pipefs
 %dir /var/lib/nfs
 %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd
 %dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm
+%dir %attr(700,rpcuser,rpcuser) /var/lib/nfs/statd/sm.bak
 %config(noreplace) /var/lib/nfs/xtab
 %config(noreplace) /var/lib/nfs/etab
 %config(noreplace) /var/lib/nfs/rmtab
-%config(noreplace) /var/lib/nfs/state
-%doc linux-nfs/*
+%config(noreplace) %attr(644,rpcuser,rpcuser) /var/lib/nfs/state
 /sbin/rpc.statd
 /usr/sbin/exportfs
 /usr/sbin/nfsstat
@@ -307,6 +303,9 @@ fi
 %endif
 /usr/sbin/sm-notify
 /usr/sbin/start-statd
+/usr/sbin/mountstats
+/usr/sbin/nfsiostat
+/usr/sbin/blkmapd
 %{_mandir}/*/*
 %config /etc/rc.d/init.d/nfslock
 
@@ -317,6 +316,12 @@ fi
 
 
 %changelog
+* Sat Jan 28 2012 Daisuke SUZUKI <daisuke@linux.or.jp> 1.2.5-1
+- update to 1.2.5
+- add patches (update to 1.2.6-rc6)
+- enable-ipv6 (add BR: libtirpc-devel)
+- add BR: device-mapper-devel
+
 * Sun Feb 13 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 1.1.5-5
 - add BuildRequires: libblkid-devel