From 2bc3ae1b1fb420454656a23d2d4e3d69110f496c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 21 Jul 2017 22:35:04 -0400 Subject: [PATCH] nfs-ganesha 2.5.1 GA --- nfs-ganesha.spec | 78 ++++++++++++++++++++++++++++++++++++++++-------- sources | 2 +- 2 files changed, 67 insertions(+), 13 deletions(-) diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index 020ecfb..0c1e3ed 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -14,8 +14,14 @@ %endif %if ( 0%{?suse_version} ) +BuildRequires: distribution-release +%if ( ! 0%{?is_opensuse} ) BuildRequires: sles-release >= 12 Requires: sles-release >= 12 +%else +BuildRequires: openSUSE-release +Requires: openSUSE-release +%endif %global with_systemd 1 %global with_nfsidmap 1 @@ -75,12 +81,16 @@ Requires: sles-release >= 12 %bcond_without system_ntirpc %global use_system_ntirpc %{on_off_switch system_ntirpc} -# %%global dev final -# %%global dash_dev_version 2.5-final +%bcond_without man_page +%global use_man_page %{on_off_switch man_page} + + +# %%global dev final +# %%global dash_dev_version 2.5-final Name: nfs-ganesha -Version: 2.5.0 -Release: 4%{?dev:%{dev}}%{?dist} +Version: 2.5.1 +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ @@ -111,7 +121,7 @@ BuildRequires: libntirpc-devel >= 1.5.3 %if ( 0%{?fedora} ) # this should effectively be a no-op, as all Fedora installs should have it # with selinux. -Requires: policycoreutils-python +Requires: policycoreutils-python %endif Requires: nfs-utils %if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) || ( 0%{?suse_version} ) @@ -142,6 +152,9 @@ Requires(postun): systemd %else BuildRequires: initscripts %endif +%if %{with man_page} +BuildRequires: python-sphinx +%endif Requires(post): psmisc Requires(pre): shadow-utils @@ -198,8 +211,13 @@ BuildRequires: PyQt4-devel Requires: PyQt4 %endif %endif -BuildRequires: python2-devel +%if ( 0%{?suse_version} ) +BuildRequires: python-devel +Requires: nfs-ganesha = %{version}-%{release}, python +%else +BuildRequires: python2-devel Requires: nfs-ganesha = %{version}-%{release}, python2 +%endif %description utils This package contains utility scripts for managing the NFS-GANESHA server @@ -210,7 +228,7 @@ This package contains utility scripts for managing the NFS-GANESHA server Summary: The NFS-GANESHA's library for use with LTTng Group: Applications/System BuildRequires: lttng-ust-devel >= 2.3 -Requires: nfs-ganesha = %{version}-%{release}, lttng-tools >= 2.3, lttng-ust >= 2.3 +Requires: nfs-ganesha = %{version}-%{release}, lttng-tools >= 2.3, lttng-ust >= 2.3 %description lttng This package contains the libganesha_trace.so library. When preloaded @@ -240,7 +258,7 @@ Group: Applications/System Requires: nfs-ganesha = %{version}-%{release} %description mem -This package contains a FSAL shared object to be used with NFS-Ganesha. This +This package contains a FSAL shared object to be used with NFS-Ganesha. This is used for speed and latency testing. %endif @@ -348,6 +366,7 @@ cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DUSE_DBUS=ON \ -DUSE_9P=ON \ -DDISTNAME_HAS_GIT_DATA=OFF \ + -DUSE_MAN_PAGE=%{use_man_page} \ %if %{with jemalloc} -DALLOCATOR=jemalloc %endif @@ -377,7 +396,7 @@ install -m 644 config_samples/rgw.conf %{buildroot}%{_sysconfdir}/ganesha %if %{with_systemd} mkdir -p %{buildroot}%{_unitdir} -install -m 644 scripts/systemd/nfs-ganesha.service %{buildroot}%{_unitdir}/nfs-ganesha.service +install -m 644 scripts/systemd/nfs-ganesha.service.el7 %{buildroot}%{_unitdir}/nfs-ganesha.service install -m 644 scripts/systemd/nfs-ganesha-lock.service %{buildroot}%{_unitdir}/nfs-ganesha-lock.service install -m 644 scripts/systemd/nfs-ganesha-config.service %{buildroot}%{_unitdir}/nfs-ganesha-config.service install -m 644 scripts/systemd/sysconfig/nfs-ganesha %{buildroot}%{_sysconfdir}/sysconfig/ganesha @@ -454,6 +473,7 @@ exit 0 %postun %if ( 0%{?suse_version} ) %service_del_postun nfs-ganesha-lock.service +%debug_package %else %if %{with_systemd} %systemd_postun_with_restart nfs-ganesha-lock.service @@ -494,17 +514,33 @@ exit 0 %{_sysconfdir}/init.d/nfs-ganesha %endif +%if %{with man_page} +%{_mandir}/*/ganesha-config.8.gz +%{_mandir}/*/ganesha-core-config.8.gz +%{_mandir}/*/ganesha-export-config.8.gz +%{_mandir}/*/ganesha-cache-config.8.gz +%{_mandir}/*/ganesha-log-config.8.gz +%endif + + %files mount-9P %{_sbindir}/mount.9P - +%if %{with man_page} +%{_mandir}/*/ganesha-9p-config.8.gz +%endif %files vfs %{_libdir}/ganesha/libfsalvfs* %config(noreplace) %{_sysconfdir}/ganesha/vfs.conf - +%if %{with man_page} +%{_mandir}/*/ganesha-vfs-config.8.gz +%endif %files proxy %{_libdir}/ganesha/libfsalproxy* +%if %{with man_page} +%{_mandir}/*/ganesha-proxy-config.8.gz +%endif # Optional packages %if %{with nullfs} @@ -530,18 +566,27 @@ exit 0 %if ! %{with_systemd} %{_sysconfdir}/init.d/nfs-ganesha-gpfs %endif +%if %{with man_page} +%{_mandir}/*/ganesha-gpfs-config.8.gz +%endif %endif %if %{with xfs} %files xfs %{_libdir}/ganesha/libfsalxfs* %config(noreplace) %{_sysconfdir}/ganesha/xfs.conf +%if %{with man_page} +%{_mandir}/*/ganesha-xfs-config.8.gz +%endif %endif %if %{with ceph} %files ceph %{_libdir}/ganesha/libfsalceph* %config(noreplace) %{_sysconfdir}/ganesha/ceph.conf +%if %{with man_page} +%{_mandir}/*/ganesha-ceph-config.8.gz +%endif %endif %if %{with rgw} @@ -550,12 +595,18 @@ exit 0 %{_libdir}/ganesha/libfsalrgw* %config(noreplace) %{_sysconfdir}/ganesha/rgw.conf %config(noreplace) %{_sysconfdir}/ganesha/rgw_bucket.conf +%if %{with man_page} +%{_mandir}/*/ganesha-rgw-config.8.gz +%endif %endif %if %{with gluster} %files gluster %config(noreplace) %{_sysconfdir}/logrotate.d/ganesha-gfapi %{_libdir}/ganesha/libfsalgluster* +%if %{with man_page} +%{_mandir}/*/ganesha-gluster-config.8.gz +%endif %endif %if %{with panfs} @@ -594,10 +645,13 @@ exit 0 %{_bindir}/sm_notify.ganesha %{_bindir}/ganesha_mgr %{_bindir}/ganesha_conf -%{_mandir}/*/* +%{_mandir}/*/ganesha_conf.8.gz %endif %changelog +* Fri Jul 21 2017 Kaleb S. KEITHLEY 2.5.1-1 +- nfs-ganesha 2.5.1 GA + * Wed Jul 19 2017 Kaleb S. KEITHLEY 2.5.0-4 - nfs-ganesha 2.5.0 rebuild with libntirpc-1.5.3 diff --git a/sources b/sources index bb28cc4..ee960ae 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.5.0.tar.gz) = 6f00125d71c250fd163e3a7663b30367cbe11d2cb868f36c28ced6ece8e24094d8b62e3649ed669e9b03dfc8d72cdc12ac1ab51bad9b77353a82f30a9f6dd1a9 +SHA512 (nfs-ganesha-2.5.1.tar.gz) = f6c49da23e8fe9aa0db07119c98669872e75e83bac39dbbfeb057b36e4a681526869c1dd31b30a6c30b4dda75ab5bfde2cd218f2636e19062ef9175304ca55e4