nfs-ganesha 2.8.3 GA

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>

nfs-ganesha.spec

@@ -127,18 +127,15 @@ Requires: openSUSE-release
 
 %global dev_version %{lua: s = string.gsub('@GANESHA_EXTRA_VERSION@', '^%-', ''); s2 = string.gsub(s, '%-', '.'); print((s2 ~= nil and s2 ~= '') and s2 or "0.1") }
 #%%global	dev rc1
-#%%global dash_dev_version 2.8-rc1
 
 Name:		nfs-ganesha
-Version:	2.8.2
+Version:	2.8.3
-Release:	6%{?dev:%{dev}}%{?dist}
+Release:	1%{?dev:%{dev}}%{?dist}
 Summary:	NFS-Ganesha is a NFS Server running in user space
 License:	LGPLv3+
 Url:		https://github.com/nfs-ganesha/nfs-ganesha/wiki
 
-Source0:	https://github.com/%{name}/%{name}/archive/V%{version}/%{name}-%{version}.tar.gz
+Source0:	https://github.com/%{name}/%{name}/archive/V%{version}%{?dev:-%{dev}}/%{name}-%{version}%{?dev:-%{dev}}.tar.gz
-Patch0001:	0001-src-scripts-gpfs-epoch.patch
-Patch0002:	0002-src-CMakeLists.txt.patch
 
 BuildRequires:	cmake
 BuildRequires:	bison
@@ -146,6 +143,9 @@ BuildRequires:	flex
 BuildRequires:	pkgconfig
 BuildRequires:	userspace-rcu-devel
 BuildRequires:	krb5-devel
+%if %{with rados_recov} || %{with rados_urls}
+BuildRequires: librados-devel >= 0.61
+%endif
 %if ( 0%{?suse_version} >= 1330 )
 BuildRequires:  libnsl-devel
 %else
@@ -220,10 +220,14 @@ Requires(postun): systemd
 BuildRequires:	initscripts
 %endif
 %if %{with man_page}
-%if ( 0%{?fedora} >= 28 || 0%{?rhel} >= 8 )
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-BuildRequires: python3-sphinx
-%else
 BuildRequires: python-sphinx
+%else
+%if ( 0%{?suse_version} )
+BuildRequires: python3-Sphinx
+%else
+BuildRequires: python3-sphinx
+%endif
 %endif
 %endif
 Requires(post): psmisc
@@ -271,25 +275,26 @@ be used with NFS-Ganesha to support PROXY based filesystems
 %if %{with utils}
 %package utils
 Summary: The NFS-GANESHA util scripts
-%if ( 0%{?suse_version} )
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-Requires:	dbus-1-python, python-gobject2 python-pyparsing
+Requires:	dbus-python, pygobject2, pyparsing
+BuildRequires:	python-devel
 %else
-%if ( 0%{?fedora} >= 28 || 0%{?rhel} >= 8 )
+Requires:	python3-gobject, python3-pyparsing
-Requires:	python3-dbus, python3-gobject, python3-pyparsing
 BuildRequires:	python3-devel
-%else
-Requires:	python2-dbus, pygobject2, python2-pyparsing
-BuildRequires:	python2-devel
 %endif
+%if ( 0%{?suse_version} )
+Requires:	dbus-1-python
+%else
+Requires:	python3-dbus
 %endif
 %if %{with gui_utils}
 %if ( 0%{?suse_version} )
-BuildRequires:	python-qt4-devel
+BuildRequires:	python-qt5-devel
 %else
 %if ( 0%{?fedora} >= 31 || 0%{?rhel} >= 8 )
-BuildRequires:	python3-PyQt5-devel
+BuildRequires:	PyQt5-devel
 %else
-BuildRequires:	python3-PyQt4-devel
+BuildRequires:	PyQt4-devel
 %endif
 %endif
 %endif
@@ -313,12 +318,24 @@ to the ganesha.nfsd server, it makes it possible to trace using LTTng.
 %if %{with rados_recov}
 %package rados-grace
 Summary: The NFS-GANESHA command for managing the RADOS grace database
-BuildRequires: librados-devel >= 12.2.0
 Requires: nfs-ganesha = %{version}-%{release}
 
 %description rados-grace
 This package contains the ganesha-rados-grace tool for interacting with the
-database used by the rados_cluster recovery backend.
+database used by the rados_cluster recovery backend and the
+libganesha_rados_grace shared library for using RADOS storage for
+recovery state.
+%endif
+
+%if %{with rados_urls}
+%package rados-urls
+Summary: The NFS-GANESHA library for use with RADOS URLs
+Group: Applications/System
+Requires: nfs-ganesha = %{version}-%{release}
+
+%description rados-urls
+This package contains the libganesha_rados_urls library used for
+handling RADOS URL configurations.
 %endif
 
 # Option packages start here. use "rpmbuild --with gpfs" (or equivalent)
@@ -423,7 +440,7 @@ be used with NFS-Ganesha to support PANFS
 %package gluster
 Summary: The NFS-GANESHA GLUSTER FSAL
 Requires:	nfs-ganesha = %{version}-%{release}
-BuildRequires:	glusterfs-api-devel >= 3.12.3
+BuildRequires:	glusterfs-api-devel >= 6.0
 BuildRequires:	libattr-devel, libacl-devel
 
 %description gluster
@@ -435,9 +452,9 @@ be used with NFS-Ganesha to support Gluster
 %if ( 0%{?fedora} >= 29 || 0%{?rhel} >= 8 )
 %package selinux
 Summary: The NFS-GANESHA SELINUX targeted policy
-BuildArch:     noarch
+BuildArch:	noarch
-Requires:      nfs-ganesha = %{version}-%{release}
+Requires:	nfs-ganesha = %{version}-%{release}
-BuildRequires:        selinux-policy-devel
+BuildRequires:	selinux-policy-devel
 %{?selinux_requires}
 
 %description selinux
@@ -496,9 +513,7 @@ Development headers and auxiliary files for developing with %{name}.
 %endif
 
 %prep
-%setup -q -n %{name}-%{version}
+%setup -q -n %{name}-%{version}%{?dev:-%{dev}}
-%patch0001 -p1
-%patch0002 -p1
 
 %build
 cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo	\
@@ -567,10 +582,6 @@ install -m 644 scripts/systemd/nfs-ganesha.service.el7	%{buildroot}%{_unitdir}/n
 install -m 644 scripts/systemd/nfs-ganesha-lock.service.el7	%{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
-%if 0%{?_tmpfilesdir:1}
-mkdir -p %{buildroot}%{_tmpfilesdir}
-install -m 644 scripts/systemd/tmpfiles.d/ganesha.conf	%{buildroot}%{_tmpfilesdir}
-%endif
 mkdir -p %{buildroot}%{_localstatedir}/log/ganesha
 %else
 mkdir -p %{buildroot}%{_sysconfdir}/init.d
@@ -600,7 +611,6 @@ install -m 644 config_samples/logrotate_fsal_gluster %{buildroot}%{_sysconfdir}/
 %endif
 
 %if %{with gpfs}
-install -m 755 scripts/gpfs-epoch %{buildroot}%{_libexecdir}/ganesha
 install -m 644 config_samples/gpfs.conf	%{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/gpfs.ganesha.nfsd.conf %{buildroot}%{_sysconfdir}/ganesha
 install -m 644 config_samples/gpfs.ganesha.main.conf %{buildroot}%{_sysconfdir}/ganesha
@@ -621,6 +631,14 @@ install -p -m 644 selinux/ganesha.if %{buildroot}%{_selinux_store_path}/devel/in
 install -m 0644 selinux/ganesha.pp.bz2 %{buildroot}%{_selinux_store_path}/packages
 %endif
 
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
+rm -f %{buildroot}/%{python_sitelib}/gpfs*
+rm -f %{buildroot}/%{python_sitelib}/__init__.*
+%else
+rm -f %{buildroot}/%{python3_sitelib}/gpfs*
+rm -f %{buildroot}/%{python3_sitelib}/__init__.*
+%endif
+
 %post
 %if ( 0%{?suse_version} )
 %service_add_post nfs-ganesha.service nfs-ganesha-lock.service nfs-ganesha-config.service
@@ -686,9 +704,6 @@ exit 0
 %{_unitdir}/nfs-ganesha.service
 %{_unitdir}/nfs-ganesha-lock.service
 %{_unitdir}/nfs-ganesha-config.service
-%if 0%{?_tmpfilesdir:1}
-%{_tmpfilesdir}/ganesha.conf
-%endif
 %else
 %{_sysconfdir}/init.d/nfs-ganesha
 %endif
@@ -704,12 +719,18 @@ exit 0
 %if %{with rados_recov}
 %files rados-grace
 %{_bindir}/ganesha-rados-grace
+%{_libdir}/libganesha_rados_recov.so*
 %if %{with man_page}
 %{_mandir}/*/ganesha-rados-grace.8.gz
 %{_mandir}/*/ganesha-rados-cluster-design.8.gz
 %endif
 %endif
 
+%if %{with rados_urls}
+%files rados-urls
+%{_libdir}/libganesha_rados_urls.so*
+%endif
+
 %if %{with 9P}
 %files mount-9P
 %{_sbindir}/mount.9P
@@ -837,17 +858,12 @@ exit 0
 
 %if %{with utils}
 %files utils
-%if ( 0%{?suse_version} )
+%if ( 0%{?rhel} && 0%{?rhel} < 8 )
-%{python2_sitelib}/Ganesha/*
+%{python_sitelib}/Ganesha/*
-%{python2_sitelib}/ganeshactl-*-info
+%{python_sitelib}/ganeshactl-*-info
 %else
-%if ( 0%{?fedora} >= 28 || 0%{?rhel} >= 8 )
 %{python3_sitelib}/Ganesha/*
 %{python3_sitelib}/ganeshactl-*-info
-%else
-%{python2_sitelib}/Ganesha/*
-%{python2_sitelib}/ganeshactl-*-info
-%endif
 %endif
 %if %{with gui_utils}
 %{_bindir}/ganesha-admin
@@ -874,6 +890,9 @@ exit 0
 %endif
 
 %changelog
+* Tue Nov 26 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.3-1
+- nfs-ganesha 2.8.3 GA
+
 * Wed Sep 25 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-6
 - PyQt4 -> PyQt5
 

sources

@@ -1 +1 @@
-SHA512 (nfs-ganesha-2.8.2.tar.gz) = 80272a00dae5af3270bced97010a84453e3fdb987b3984d0782209f9328661815968aca1cc985a1acf5f7b14aedadc9e4231bee6a59370a362bccc113e93d1fe
+SHA512 (nfs-ganesha-2.8.3.tar.gz) = 41125c3116f796a81ea4ec493d187fb3121eca6de941b8cc8eec4e86b2a31b3979dd5da291a04b7315bf3b30c872f53f0c750e51b4f4d1614fdb32759a3578f5