[fedfs-utils] - Fix fedfs-utils-server dependency on nfs-utils - Add kernel version dependency to ensure NFSD supp

Thu Sep 5 15:38:37 UTC 2013

commit aa1e0d526c6e0b4c7047727c0029525a69136acc
Author: Chuck Lever <chuck.lever at oracle.com>
Date:   Thu Sep 5 11:37:49 2013 -0400

    - Fix fedfs-utils-server dependency on nfs-utils
    - Add kernel version dependency to ensure NFSD supports modern junctions
    - Revert spec clean-ups that are needed only for el6

 fedfs-utils.spec |  110 ++++++++++++++++++++++++++++-------------------------
 1 files changed, 58 insertions(+), 52 deletions(-)
---

diff --git a/fedfs-utils.spec b/fedfs-utils.spec
index fe4d208..34ae5c1 100644
--- a/fedfs-utils.spec
+++ b/fedfs-utils.spec
@@ -1,6 +1,6 @@
 Name:           fedfs-utils
 Version:        0.9.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Utilities for mounting and managing FedFS
 
 Group:          System Environment/Daemons
@@ -19,8 +19,8 @@ Source0:        http://oss.oracle.com/projects/%{name}/dist/files/%{name}-%{vers
 %description
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -29,9 +29,10 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
@@ -59,9 +60,6 @@ install -m 644 contrib/init/fedfs.autofs %{buildroot}/%{_sysconfdir}/auto.master
 rm -f %{buildroot}%{_libdir}/libnfsjunct.a
 rm -f %{buildroot}%{_libdir}/libnfsjunct.la
 
-%clean
-rm -rf %{buildroot}
-
 %package common
 Summary:      Common files for FedFS
 Group:        System Environment/Daemons
@@ -71,8 +69,8 @@ This package contains files common to all of the fedfs packages.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -81,16 +79,16 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files common
-%defattr(-,root,root,-)
 %doc COPYING README INSTALL ChangeLog doc/ldap/fedfs.schema doc/ldap/fedfs-schema.ldif
 %{_mandir}/man7/fedfs.7.*
 
@@ -107,8 +105,8 @@ as a client.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -117,16 +115,16 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files client
-%defattr(-,root,root,-)
 /sbin/mount.fedfs
 %{_sbindir}/fedfs-map-nfs4
 %{_mandir}/man8/mount.fedfs.8.*
@@ -153,8 +151,8 @@ and domain administration.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -163,16 +161,16 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files nsdbparams
-%defattr(-,root,root,-)
 %{_sbindir}/nsdbparams
 %{_mandir}/man8/nsdbparams.8.*
 %{_mandir}/man7/nsdb-parameters.7.*
@@ -188,8 +186,8 @@ NFS and FedFS junction support to be enabled in nfs-utils.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -198,16 +196,16 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files devel
-%defattr(-,root,root,-)
 %{_includedir}/nfs-plugin.h
 
 %package lib
@@ -215,6 +213,8 @@ Summary:      The FedFS nfs-plugin run-time library
 Group:        System Environment/Daemons
 Requires:     %{name}-common = %{version}-%{release}
 Requires:     %{name}-nsdbparams%{?_isa} = %{version}-%{release}
+Requires:     nfs-utils >= 1.2.8
+Requires:     kernel >= 3.3.0
 %description lib
 This package contains the FedFS nfs-plugin run-time library.  This
 package must be installed for FedFS junction support to be enabled in
@@ -222,8 +222,8 @@ rpc.mountd.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -232,9 +232,10 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
@@ -247,7 +248,6 @@ FedFS may support other network file system protocols in the future.
 %files lib
 # We need to include this in the lib package because it is
 # dlopen()ed by the junction support code in nfs-utils.
-%defattr(-,root,root,-)
 %{_libdir}/libnfsjunct.so
 %{_libdir}/libnfsjunct.so.*
 
@@ -257,7 +257,8 @@ Group:        System Environment/Daemons
 Requires:     %{name}-common = %{version}-%{release}
 Requires:     %{name}-nsdbparams%{?_isa} = %{version}-%{release}
 Requires:     %{name}-lib%{?_isa} = %{version}-%{release}
-Requires:     nfs-utils-1.2.8
+Requires:     nfs-utils >= 1.2.8
+Requires:     kernel >= 3.3.0
 Requires(post):   systemd-units
 Requires(preun):  systemd-units
 Requires(postun): systemd-units
@@ -268,8 +269,8 @@ on a Linux NFS fileserver.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -278,9 +279,10 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
@@ -303,7 +305,6 @@ exit 0
 %systemd_postun_with_restart %{unit_name}.service
 
 %files server
-%defattr(-,root,root,-)
 %dir %{_sharedstatedir}/fedfs
 %{_sbindir}/nfsref
 %{_sbindir}/rpc.fedfsd
@@ -322,8 +323,8 @@ This package contains the tools needed to manage a FedFS domain.
 
 RFC 5716 introduces the Federated File System (FedFS, for short). FedFS
 is an extensible standardized mechanism by which system administrators
-construct a coherent file name space across multiple file servers using file
-system referrals.
+construct a coherent file name space across multiple file servers using
+file system referrals.
 
 A file system referral is like a symbolic link to another file system
 share, but it is not visible to applications. It behaves like an
@@ -332,16 +333,16 @@ application first accesses that directory. The arguments of the mount
 operation are controlled by information returned by the file server.
 
 Today, file system referral mechanisms exist in several network file
-system protocols. FedFS provides its file name space features by leveraging
-referral mechanisms already built in to network file system protocols.
-Thus no change to file system protocols or clients is required.
+system protocols. FedFS provides its file name space features by
+leveraging referral mechanisms already built in to network file system
+protocols.  Thus no change to file system protocols or clients is
+required.
 
 Currently, the Linux FedFS implementation supports only NFS version 4
 referrals. More on NFS version 4 referrals can be found in RFC 3530.
 FedFS may support other network file system protocols in the future.
 
 %files admin
-%defattr(-,root,root,-)
 %{_sbindir}/fedfs-create-junction
 %{_sbindir}/fedfs-create-replication
 %{_sbindir}/fedfs-delete-junction
@@ -366,6 +367,11 @@ FedFS may support other network file system protocols in the future.
 %{_mandir}/man8/nsdb-*
 
 %changelog
+* Thu Sep 05 2013 Chuck Lever <chuck.lever at oracle.com> - 0.9.3-2
+- Fix fedfs-utils-server dependency on nfs-utils
+- Add kernel version dependency to ensure NFSD supports modern junctions
+- Revert spec clean-ups that are needed only for el6
+
 * Wed Sep 04 2013 Chuck Lever <chuck.lever at oracle.com> - 0.9.3-1
 - update to fedfs-utils 0.9.3
 - enable hardened build
