Accepting request 74072 from Base:System

Fix URLs. (forwarded request 74051 from a_jaeger)

OBS-URL: https://build.opensuse.org/request/show/74072
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=81
This commit is contained in:
Sascha Peilicke 2011-06-20 08:53:17 +00:00 committed by Git OBS Bridge
commit bab5c06e73
2 changed files with 28 additions and 2 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Jun 17 14:12:19 UTC 2011 - aj@suse.de
- Fix URLs.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Jun 2 06:48:03 UTC 2011 - nfbrown@novell.com Thu Jun 2 06:48:03 UTC 2011 - nfbrown@novell.com

View File

@ -34,8 +34,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
AutoReqProv: on AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: ftp://ftp.sourceforge.net/pub/sourceforge/n/nf/nfs/nfs-utils-%{version}.tar.bz2 Source0: http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/nfs-utils-%{version}.tar.bz2
Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2 # Download does not work:
# Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
Source1: nfs.doc.tar.bz2
Source2: nfs.init Source2: nfs.init
Source3: nfsserver.init Source3: nfsserver.init
Source4: sysconfig.nfs Source4: sysconfig.nfs
@ -56,6 +58,7 @@ Patch4: nfs-utils-improve-v4-umount
Patch5: nfs-utils-fix-remount Patch5: nfs-utils-fix-remount
Suggests: python-base Suggests: python-base
%description %description
This package contains the NFS utilities. You can tune the number of This package contains the NFS utilities. You can tune the number of
server threads via the sysconfig variable USE_KERNEL_NFSD_NUMBER. For server threads via the sysconfig variable USE_KERNEL_NFSD_NUMBER. For
@ -78,6 +81,7 @@ PreReq: %fillup_prereq %insserv_prereq
PreReq: permissions sysvinit(portmap) sysvinit(network) PreReq: permissions sysvinit(portmap) sysvinit(network)
Provides: aaa_base:/etc/init.d/nfs Provides: aaa_base:/etc/init.d/nfs
%description -n nfs-client %description -n nfs-client
This package contains common NFS utilities which are needed for client This package contains common NFS utilities which are needed for client
and kernel based server. and kernel based server.
@ -99,6 +103,7 @@ Conflicts: nfs-server
Requires: nfs-client = %{version} rpcbind Requires: nfs-client = %{version} rpcbind
PreReq: %fillup_prereq %insserv_prereq PreReq: %fillup_prereq %insserv_prereq
%description -n nfs-kernel-server %description -n nfs-kernel-server
This package contains support for the kernel based NFS server. You can This package contains support for the kernel based NFS server. You can
tune the number of server threads via the sysconfig variable tune the number of server threads via the sysconfig variable
@ -119,6 +124,7 @@ Summary: Support Utilities for NFS
Obsoletes: nfs-utils < 1.1.0 Obsoletes: nfs-utils < 1.1.0
Requires: latex2html-pngicons Requires: latex2html-pngicons
%description -n nfs-doc %description -n nfs-doc
This package contains additional NFS documentation. This package contains additional NFS documentation.
@ -139,6 +145,7 @@ Authors:
%patch5 -p1 %patch5 -p1
cp %{S:6} . cp %{S:6} .
%build %build
%{?suse_update_config:%{suse_update_config -f }} %{?suse_update_config:%{suse_update_config -f }}
rm -f configure; autoreconf -fi rm -f configure; autoreconf -fi
@ -161,6 +168,7 @@ sed -i \
$i $i
done done
%install %install
make install-strip DESTDIR=$RPM_BUILD_ROOT make install-strip DESTDIR=$RPM_BUILD_ROOT
rm -f linux-nfs/Makefile* rm -f linux-nfs/Makefile*
@ -195,13 +203,16 @@ install -m 644 utils/mount/nfsmount.conf $RPM_BUILD_ROOT/etc/nfsmount.conf
# hack to avoid automatic python dependency # hack to avoid automatic python dependency
chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat} chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%pre -n nfs-client %pre -n nfs-client
useradd -r -c 'NFS statd daemon' \ useradd -r -c 'NFS statd daemon' \
-s /sbin/nologin -d /var/lib/nfs -g nogroup statd &> /dev/null || : -s /sbin/nologin -d /var/lib/nfs -g nogroup statd &> /dev/null || :
%post -n nfs-client %post -n nfs-client
chown statd:nogroup /var/lib/nfs chown statd:nogroup /var/lib/nfs
chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || :
@ -219,9 +230,11 @@ fi
# #
%set_permissions /sbin/mount.nfs %set_permissions /sbin/mount.nfs
%preun -n nfs-client %preun -n nfs-client
%stop_on_removal nfs %stop_on_removal nfs
%postun -n nfs-client %postun -n nfs-client
%restart_on_update nfs %restart_on_update nfs
[ -x /sbin/mkinitrd_setup ] && mkinitrd_setup [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup
@ -230,9 +243,11 @@ fi
%verifyscript -n nfs-client %verifyscript -n nfs-client
%verify_permissions -e /sbin/mount.nfs %verify_permissions -e /sbin/mount.nfs
%preun -n nfs-kernel-server %preun -n nfs-kernel-server
%stop_on_removal nfsserver %stop_on_removal nfsserver
%post -n nfs-kernel-server %post -n nfs-kernel-server
### migrate from /var/lock/subsys ### migrate from /var/lock/subsys
[ -d /var/run/nfs ] || mkdir /var/run/nfs [ -d /var/run/nfs ] || mkdir /var/run/nfs
@ -245,10 +260,12 @@ fi
### ###
%{fillup_and_insserv nfsserver} %{fillup_and_insserv nfsserver}
%postun -n nfs-kernel-server %postun -n nfs-kernel-server
%restart_on_update nfsserver %restart_on_update nfsserver
%insserv_cleanup %insserv_cleanup
%files -n nfs-client %files -n nfs-client
%defattr(-,root,root) %defattr(-,root,root)
%config /etc/init.d/nfs %config /etc/init.d/nfs
@ -302,6 +319,7 @@ fi
%attr(0700,statd,nogroup) %ghost /var/lib/nfs/state %attr(0700,statd,nogroup) %ghost /var/lib/nfs/state
%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-client %config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-client
%files -n nfs-kernel-server %files -n nfs-kernel-server
%defattr(-,root,root) %defattr(-,root,root)
%config /etc/init.d/nfsserver %config /etc/init.d/nfsserver
@ -324,8 +342,11 @@ fi
%config(noreplace) /var/lib/nfs/rmtab %config(noreplace) /var/lib/nfs/rmtab
%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server %config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server
%files -n nfs-doc %files -n nfs-doc
%defattr(-,root,root) %defattr(-,root,root)
%doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4 %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4
%changelog %changelog