Updated to latest upstream RC release: nfs-utils-2-2-2-rc1

Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2017-11-02 12:54:43 -04:00
parent 0a5cbbdec0
commit f461dd81e6
4 changed files with 48 additions and 7337 deletions

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

42
nfs-utils-2.2.2-rc1.patch Normal file
View File

@ -0,0 +1,42 @@
diff --git a/.gitignore b/.gitignore
index 540737d..f17db9c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,7 @@ support/include/stamp-h1
*.o
*.lo
*.la
+*.pc
.libs
lib*.a
test-driver
diff --git a/configure.ac b/configure.ac
index 9b2a502..c7651f2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,6 +441,8 @@ if test -n "$path_plugins" ; then
fi
AM_CONDITIONAL(PATH_PLUGINS, test -n "$path_plugins")
+AC_SUBST(AM_CPPFLAGS, "$AM_CPPFLAGS -I../../support/nfsidmap")
+
dnl Check for IPv6 support
AC_IPV6
diff --git a/support/nfsidmap/libnfsidmap.pc b/support/nfsidmap/libnfsidmap.pc
deleted file mode 100644
index 5ec28ae..0000000
--- a/support/nfsidmap/libnfsidmap.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib64
-includedir=${prefix}/include
-
-Name: libnfsidmap
-Description: Library that handles mapping between names and ids for NFSv4.
-Requires:
-Version: 2.1.1
-Libs: -L${exec_prefix}/lib64 -lnfsidmap
-Cflags: -I${prefix}/include

View File

@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
Name: nfs-utils Name: nfs-utils
URL: http://linux-nfs.org/ URL: http://linux-nfs.org/
Version: 2.2.1 Version: 2.2.1
Release: 0%{?dist} Release: 0.rc1%{?dist}
Epoch: 1 Epoch: 1
# group all 32bit related archs # group all 32bit related archs
@ -15,6 +15,8 @@ Source3: nfs-utils_env.sh
Source4: lockd.conf Source4: lockd.conf
Source5: 24-nfs-server.conf Source5: 24-nfs-server.conf
Patch001: nfs-utils-2.2.2-rc1.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
Patch102: nfs-utils-1.2.5-idmap-errmsg.patch Patch102: nfs-utils-1.2.5-idmap-errmsg.patch
@ -316,6 +318,9 @@ fi
%{_libdir}/libnfsidmap.so %{_libdir}/libnfsidmap.so
%changelog %changelog
* Thu Nov 2 2017 Steve Dickson <steved@redhat.com> 2.2.1-0.rc1
-Updated to latest upstream RC release: nfs-utils-2-2-2-rc1
* Mon Oct 30 2017 Steve Dickson <steved@redhat.com> 2.2.1-0 * Mon Oct 30 2017 Steve Dickson <steved@redhat.com> 2.2.1-0
- Updated to latest upstream release: nfs-utils-2-2-1 - Updated to latest upstream release: nfs-utils-2-2-1