Accepting request 838679 from Base:System

- Remove nfs-doc package.  The documentation is 20 years old
  and barely relevant.
  (bsc#1171448)

- Update to version 2.5.1
  Dropped patch accepted upstream:
  0001-conffile-Don-t-give-warning-for-optional-config-file.patch
  - improvements for 64bit time
  - improvements for SASL referrals
  - Rename clddb-tool to nfsdclddb
  - New tools  nfsdclnts
  - Better python3 support
  - many bug-fixes

OBS-URL: https://build.opensuse.org/request/show/838679
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=157

0001-conffile-Don-t-give-warning-for-optional-config-file.patch

@@ -1,33 +0,0 @@
-From 1c20fcd0a315f3c692a465159985e6125289f4e4 Mon Sep 17 00:00:00 2001
-From: NeilBrown <neilb@suse.de>
-Date: Fri, 27 Mar 2020 15:58:24 +1100
-Subject: [PATCH] conffile: Don't give warning for optional config files.
-
-A recent commit added the possibility of optional config files for which
-warning messages would be suppressed.
-Unfortunately only one of the possible warning messages - the least
-likely one - was suppressed.
-
-This patch suppresses the other.
-
-Fixes: c6fdcbe0a5cf ("conffile: allow optional include files")
-Signed-off-by: NeilBrown <neilb@suse.de>
----
- support/nfs/conffile.c |    6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- a/support/nfs/conffile.c
-+++ b/support/nfs/conffile.c
-@@ -429,9 +429,9 @@ conf_parse_line(int trans, char *line, c
- 
- 		subconf = conf_readfile(relpath);
- 		if (subconf == NULL) {
--			xlog_warn("config error at %s:%d: "
--				"error loading included config",
--				  filename, lineno);
-+			if (!optional)
-+				xlog_warn("config error at %s:%d: error loading included config",
-+					  filename, lineno);
- 			if (relpath)
- 				free(relpath);
- 			return;

nfs-utils-2.4.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af65fce5dd8370cff9ead67baac5a6cd69c376dcadfef264dc2c78c904f26599
-size 685744

nfs-utils-2.5.1.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f1c8170e16a07d9836bbf0836d48d0c842b6f0e0e8b18748f099751851d30c4
+size 694468

nfs-utils.changes

@@ -1,3 +1,24 @@
+-------------------------------------------------------------------
+Wed Sep 30 06:24:22 UTC 2020 - Neil Brown <nfbrown@suse.com>
+
+- Remove nfs-doc package.  The documentation is 20 years old
+  and barely relevant.
+  (bsc#1171448)
+
+-------------------------------------------------------------------
+Tue Jul 14 16:05:08 UTC 2020 - Petr Vorel <pvorel@suse.cz>
+
+- Update to version 2.5.1
+  Dropped patch accepted upstream:
+  0001-conffile-Don-t-give-warning-for-optional-config-file.patch
+
+  - improvements for 64bit time
+  - improvements for SASL referrals
+  - Rename clddb-tool to nfsdclddb
+  - New tools  nfsdclnts
+  - Better python3 support
+  - many bug-fixes
+
 -------------------------------------------------------------------
 Fri Jun  5 10:02:18 UTC 2020 - Thorsten Kukuk <kukuk@suse.com>
 

nfs-utils.spec

@@ -22,16 +22,13 @@
 %endif
 
 Name:           nfs-utils
-Version:        2.4.3
+Version:        2.5.1
 Release:        0
 Summary:        Support Utilities for Kernel nfsd
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/NFS
 URL:            http://kernel.org/pub/linux/utils/nfs-utils/
 Source0:        http://kernel.org/pub/linux/utils/nfs-utils/%{version}/nfs-utils-%{version}.tar.xz
-# Download does not work:
-# Source1:        ftp://nfs.sourceforge.net/pub/nfs/nfs.doc.tar.bz2
-Source1:        nfs.doc.tar.bz2
 Source4:        sysconfig.nfs
 Source11:       idmapd.conf
 Source12:       statd-user.conf
@@ -45,7 +42,6 @@ Source25:       rpc-svcgssd.options.conf
 Source26:       nfs.conf
 Source27:       nfs-kernel-server.tmpfiles.conf
 Patch0:         nfs-utils-1.0.7-bind-syntax.patch
-Patch1:         0001-conffile-Don-t-give-warning-for-optional-config-file.patch
 
 BuildRequires:  e2fsprogs-devel
 BuildRequires:  fedfs-utils-devel
@@ -128,20 +124,9 @@ In NFSv4, identities of users are conveyed by names rather than user ID
 and group ID. Both the NFS server and client code in the kernel need to
 translate these to numeric IDs.
 
-%package -n nfs-doc
-Summary:        Support Utilities for NFS
-Group:          Productivity/Networking/NFS
-Requires:       latex2html-pngicons
-Obsoletes:      nfs-utils < 1.1.0
-Supplements:    (nfs-utils and patterns-base-documentation)
-
-%description -n nfs-doc
-This package contains additional NFS documentation.
-
 %prep
-%setup -q -a 1
+%setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 autoreconf -fvi
@@ -161,14 +146,6 @@ export LDFLAGS="-pie"
 	--enable-mountconfig
 make %{?_smp_mflags}
 %sysusers_generate_pre %{SOURCE12} statd
-cd nfs
-for i in *.html ; do
-sed -i \
- -e "s@%{_prefix}/lib/latex2html/icons.png/next_motif.png@%{_datadir}/latex2html/icons/next.png@" \
- -e "s@%{_prefix}/lib/latex2html/icons.png/up_motif_gr.png@%{_datadir}/latex2html/icons/up.png@" \
- -e "s@%{_prefix}/lib/latex2html/icons.png/previous_motif_gr.png@%{_datadir}/latex2html/icons/prev.png@" \
- $i
-done
 
 %install
 make %{?_smp_mflags} DESTDIR=%{buildroot} install
@@ -281,7 +258,8 @@ fi
 /sbin/umount.nfs4
 %attr(0755,root,root) %{_sbindir}/mountstats
 %attr(0755,root,root) %{_sbindir}/nfsiostat
-%{_sbindir}/clddb-tool
+%{_sbindir}/nfsdclddb
+%{_sbindir}/nfsdclnts
 %{_sbindir}/nfsdcld
 %{_sbindir}/nfsidmap
 %{_sbindir}/nfsstat
@@ -315,7 +293,8 @@ fi
 %dir /usr/lib/systemd/system-generators
 /usr/lib/systemd/system-generators/nfs-server-generator
 /usr/lib/systemd/system-generators/rpc-pipefs-generator
-%{_mandir}/man8/clddb-tool.8%{ext_man}
+%{_mandir}/man8/nfsdclddb.8%{ext_man}
+%{_mandir}/man8/nfsdclnts.8%{ext_man}
 %{_mandir}/man5/nfsmount.conf.5%{ext_man}
 %{_mandir}/man5/nfs.conf.5%{ext_man}
 %{_mandir}/man5/nfs.5%{ext_man}
@@ -386,8 +365,4 @@ fi
 %{_mandir}/man3/*
 %doc support/nfsidmap/README
 
-%files -n nfs-doc
-%defattr(-,root,root)
-%doc nfs/*.html nfs/*.ps
-
 %changelog

nfs.doc.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8182ddf316a1c72b4edaf982b3f4a76542b6ac792b451e314792dc6b3318210e
-size 69695