From 6457db767167ab097dc995fc4efb4a70855e952a1eb6cf6e28ed2e6958817c3b Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Mon, 6 Jun 2011 09:53:39 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/nfs-utils revision 80.0 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=5d3ea5926208c5303bc33bfc92f713f3 --- nfs-utils.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 73d619a..030b97b 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -27,7 +27,7 @@ BuildRequires: libevent Url: http://nfs.sourceforge.net Summary: Support Utilities for Kernel nfsd Version: 1.2.3 -Release: 19 +Release: 21 Group: Productivity/Networking/NFS License: GPLv2+ BuildRoot: %{_tmppath}/%{name}-%{version}-build From a60740ab4e1af2a0ba018ea63095e1bfdaec80d5ac9106741518f6ca86b42a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Fri, 17 Jun 2011 16:30:46 +0000 Subject: [PATCH 2/2] Accepting request 74051 from home:a_jaeger:branches:openSUSE:Factory Fix URLs. OBS-URL: https://build.opensuse.org/request/show/74051 OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=50 --- nfs-utils.changes | 5 +++++ nfs-utils.spec | 25 +++++++++++++++++++++++-- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 249bc5b..8a9cf05 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -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 diff --git a/nfs-utils.spec b/nfs-utils.spec index 030b97b..50acf6e 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -34,8 +34,10 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: ftp://ftp.sourceforge.net/pub/sourceforge/n/nf/nfs/nfs-utils-%{version}.tar.bz2 -Source1: ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2 +Source0: http://downloads.sourceforge.net/project/nfs/nfs-utils/%{version}/nfs-utils-%{version}.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 Source3: nfsserver.init Source4: sysconfig.nfs @@ -56,6 +58,7 @@ Patch4: nfs-utils-improve-v4-umount Patch5: nfs-utils-fix-remount Suggests: python-base + %description This package contains the NFS utilities. You can tune the number of 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) Provides: aaa_base:/etc/init.d/nfs + %description -n nfs-client This package contains common NFS utilities which are needed for client and kernel based server. @@ -99,6 +103,7 @@ Conflicts: nfs-server Requires: nfs-client = %{version} rpcbind PreReq: %fillup_prereq %insserv_prereq + %description -n nfs-kernel-server This package contains support for the kernel based NFS server. You can 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 Requires: latex2html-pngicons + %description -n nfs-doc This package contains additional NFS documentation. @@ -139,6 +145,7 @@ Authors: %patch5 -p1 cp %{S:6} . + %build %{?suse_update_config:%{suse_update_config -f }} rm -f configure; autoreconf -fi @@ -161,6 +168,7 @@ sed -i \ $i done + %install make install-strip DESTDIR=$RPM_BUILD_ROOT 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 chmod 644 $RPM_BUILD_ROOT%{_sbindir}/{mountstats,nfsiostat} + %clean rm -rf $RPM_BUILD_ROOT + %pre -n nfs-client useradd -r -c 'NFS statd daemon' \ -s /sbin/nologin -d /var/lib/nfs -g nogroup statd &> /dev/null || : + %post -n nfs-client chown statd:nogroup /var/lib/nfs chown -R statd /var/lib/nfs/{state,sm,sm.bak} >& /dev/null || : @@ -219,9 +230,11 @@ fi # %set_permissions /sbin/mount.nfs + %preun -n nfs-client %stop_on_removal nfs + %postun -n nfs-client %restart_on_update nfs [ -x /sbin/mkinitrd_setup ] && mkinitrd_setup @@ -230,9 +243,11 @@ fi %verifyscript -n nfs-client %verify_permissions -e /sbin/mount.nfs + %preun -n nfs-kernel-server %stop_on_removal nfsserver + %post -n nfs-kernel-server ### migrate from /var/lock/subsys [ -d /var/run/nfs ] || mkdir /var/run/nfs @@ -245,10 +260,12 @@ fi ### %{fillup_and_insserv nfsserver} + %postun -n nfs-kernel-server %restart_on_update nfsserver %insserv_cleanup + %files -n nfs-client %defattr(-,root,root) %config /etc/init.d/nfs @@ -302,6 +319,7 @@ fi %attr(0700,statd,nogroup) %ghost /var/lib/nfs/state %config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-client + %files -n nfs-kernel-server %defattr(-,root,root) %config /etc/init.d/nfsserver @@ -324,8 +342,11 @@ fi %config(noreplace) /var/lib/nfs/rmtab %config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/nfs-kernel-server + %files -n nfs-doc %defattr(-,root,root) %doc nfs/*.html nfs/*.ps linux-nfs/* README.NFSv4 + + %changelog