diff --git a/.gitignore b/.gitignore index d378a69..05e7f22 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ /fedfs-utils-0.9.3.tar.gz /fedfs-utils-0.9.4.tar.gz /fedfs-utils-0.9.5.tar.gz +/fedfs-utils-0.10.0.tar.gz diff --git a/fedfs-utils-0.10.0-missing-man-pages.patch b/fedfs-utils-0.10.0-missing-man-pages.patch new file mode 100644 index 0000000..e3706a0 --- /dev/null +++ b/fedfs-utils-0.10.0-missing-man-pages.patch @@ -0,0 +1,14 @@ +diff --git a/doc/man/Makefile.am b/doc/man/Makefile.am +index 1d34632..974b911 100644 +--- a/doc/man/Makefile.am ++++ b/doc/man/Makefile.am +@@ -41,7 +41,8 @@ MISC_CMDS = rpc.fedfsd.8 nsdbparams.8 nfsref.8 + MOUNT_CMDS = mount.fedfs.8 fedfs-map-nfs4.8 + + man_MANS = $(MISC_DOCS) $(MISC_CMDS) $(PYTHON_CMDS) \ +- $(ADMIN_CLIENT_CMDS) $(NSDB_CLIENT_CMDS) ++ $(ADMIN_CLIENT_CMDS) $(NSDB_CLIENT_CMDS) \ ++ $(MOUNT_CMDS) + + + CLEANFILES = cscope.in.out cscope.out cscope.po.out *~ diff --git a/fedfs-utils.spec b/fedfs-utils.spec index 5183c52..1c21d98 100644 --- a/fedfs-utils.spec +++ b/fedfs-utils.spec @@ -1,5 +1,5 @@ Name: fedfs-utils -Version: 0.9.5 +Version: 0.10.0 Release: 1%{?dist} Summary: Utilities for mounting and managing FedFS @@ -7,15 +7,19 @@ Group: System Environment/Daemons License: GPLv2 URL: http://wiki.linux-nfs.org/wiki/index.php/FedFsUtilsProject BuildRequires: libidn-devel libattr-devel libcap-devel openldap-devel -BuildRequires: sqlite-devel libtirpc-devel libuuid-devel +BuildRequires: sqlite-devel libtirpc-devel libuuid-devel libconfig-devel BuildRequires: openssl-devel libxml2-devel uriparser-devel +BuildRequires: automake libtool glibc-headers +BuildRequires: python2-devel BuildRequires: systemd systemd-units Source0: http://oss.oracle.com/projects/%{name}/dist/files/%{name}-%{version}.tar.gz +Patch100: fedfs-utils-0.10.0-missing-man-pages.patch + %global _hardened_build 1 %global unit_name rpcfedfsd -%define debug_package %{nil} +# %define debug_package %{nil} %description RFC 5716 introduces the Federated File System (FedFS, for short). FedFS @@ -41,13 +45,16 @@ FedFS may support other network file system protocols in the future. %prep %setup -q -n %{name}-%{version} +%patch100 -p1 %build +./autogen.sh %configure --prefix=/usr make %{?_smp_mflags} %install -make install-strip DESTDIR=%{buildroot} +# make install-strip DESTDIR=%{buildroot} +make install DESTDIR=%{buildroot} mkdir -p %{buildroot}%{_sharedstatedir}/fedfs mkdir -p %{buildroot}%{_unitdir} mkdir -p %{buildroot}/nfs4 @@ -56,6 +63,8 @@ mkdir -p %{buildroot}%{_sysconfdir}/sysconfig install -m 644 contrib/init/fedfs %{buildroot}%{_sysconfdir}/sysconfig mkdir -p %{buildroot}/%{_sysconfdir}/auto.master.d install -m 644 contrib/init/fedfs.autofs %{buildroot}/%{_sysconfdir}/auto.master.d +mkdir -p %{buildroot}/%{_sysconfdir}/fedfsd +mv %{buildroot}/%{_sysconfdir}/access.conf %{buildroot}/%{_sysconfdir}/fedfsd # Don't package static libs to encourage use of shared library. rm -f %{buildroot}%{_libdir}/libnfsjunct.a @@ -64,7 +73,8 @@ rm -f %{buildroot}%{_libdir}/libnfsjunct.la %package common Summary: Common files for FedFS Group: System Environment/Daemons -BuildArch: noarch +BuildArch: noarch + %description common This package contains files common to all of the fedfs packages. @@ -90,7 +100,7 @@ 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 -%doc COPYING README INSTALL ChangeLog doc/ldap/fedfs.schema doc/ldap/fedfs-schema.ldif +%doc COPYING README ChangeLog doc/ldap/fedfs.schema doc/ldap/fedfs-schema.ldif %{_mandir}/man7/fedfs.7.* %package client @@ -252,6 +262,44 @@ FedFS may support other network file system protocols in the future. %{_libdir}/libnfsjunct.so %{_libdir}/libnfsjunct.so.* +%package python +Summary: FedFS Python utilities +Group: System Environment/Daemons +BuildArch: noarch +Requires: python-ldap openldap-servers + +%description python +This package contains Python tools for administering the FedFS +capabilities of a Linux NFS file server. + +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. + +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 +auto-mounted directory where a new file system mount is done when an +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. + +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 python +%{_bindir}/fedfs-domainroot +%{_bindir}/nsdb-jumpstart +%{python_sitelib}/PyFedfs/* +%{_mandir}/man8/fedfs-domainroot.8.* +%{_mandir}/man8/nsdb-jumpstart.8.* + %package server Summary: Utilities for serving FedFS domains Group: System Environment/Daemons @@ -266,7 +314,7 @@ Requires(postun): systemd-units %description server This package contains tools for managing NFS and FedFS junctions -on a Linux NFS fileserver. +on a Linux NFS file server. RFC 5716 introduces the Federated File System (FedFS, for short). FedFS is an extensible standardized mechanism by which system administrators @@ -307,12 +355,14 @@ exit 0 %files server %dir %{_sharedstatedir}/fedfs +%dir %{_sysconfdir}/fedfsd %{_sbindir}/nfsref %{_sbindir}/rpc.fedfsd +%{_mandir}/man8/nfsref.8.* %{_mandir}/man8/rpc.fedfsd.8.* -%{_mandir}/man8/nfsref.8.gz %{_unitdir}/rpcfedfsd.service %config(noreplace) %{_sysconfdir}/sysconfig/fedfs +%config(noreplace) %{_sysconfdir}/fedfsd/access.conf %package admin Summary: Utilities for administering FedFS domains @@ -368,6 +418,13 @@ FedFS may support other network file system protocols in the future. %{_mandir}/man8/nsdb-* %changelog +* Wed Feb 05 2014 Chuck Lever - 0.10.0-1 +- Run ./autogen.sh in %build to enable .spec to patch Makefiles +- This may also address (bz977556) -- workarounds removed +- Update to fedfs-utils 0.10.0 +- Introduce new subpackage for PyFedFs and python tools +- Fix a few lint nits + * Mon Dec 30 2013 Chuck Lever - 0.9.5-1 - update to fedfs-utils 0.9.5 - Update BuildRequires according to https://fedorahosted.org/fpc/ticket/318 diff --git a/sources b/sources index cd713af..76abef1 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -1c0f7b9928c8fe4dd336abac2e291012 fedfs-utils-0.9.5.tar.gz +72fad392dc64f29ceb1c7d4838b94a7b fedfs-utils-0.10.0.tar.gz