nfs-ganesha 2.8.2, #1741023

Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
This commit is contained in:
Kaleb S. KEITHLEY 2019-08-14 10:04:31 -04:00
parent 70b648dfcd
commit bbd24ff058
2 changed files with 16 additions and 3 deletions

View File

@ -0,0 +1,8 @@
--- nfs-ganesha-2.8.2/src/scripts/gpfs-epoch.orig 2019-08-14 09:55:02.130227995 -0400
+++ nfs-ganesha-2.8.2/src/scripts/gpfs-epoch 2019-08-14 09:55:13.982227995 -0400
@@ -1,4 +1,4 @@
-#!/usr/bin/python2
+#!/usr/bin/python3
# Usually ganesha daemon start up time is used as its epoch. This is
# fine for a single node configurations, but in clustered environment,

View File

@ -131,12 +131,13 @@ Requires: openSUSE-release
Name: nfs-ganesha
Version: 2.8.2
Release: 3%{?dev:%{dev}}%{?dist}
Release: 4%{?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
Patch0001: 0001-src-scripts-gpfs-epoch.patch
BuildRequires: cmake
BuildRequires: bison
@ -271,11 +272,11 @@ be used with NFS-Ganesha to support PROXY based filesystems
Summary: The NFS-GANESHA util scripts
%if ( 0%{?suse_version} )
Requires: dbus-1-python, python-gobject2 python-pyparsing
Requires: gpfs.nfs-ganesha = %{version}-%{release}, python
Requires: %{name}-gpfs = %{version}-%{release}, python
%else
%if ( 0%{?fedora} >= 28 || 0%{?rhel} >= 8 )
Requires: python3-dbus, python3-gobject, python3-pyparsing
Requires: gpfs.nfs-ganesha = %{version}-%{release}, python3
Requires: %{name}-gpfs = %{version}-%{release}, python3
BuildRequires: python3-devel
%else
Requires: python2-dbus, pygobject2, python2-pyparsing
@ -494,6 +495,7 @@ Development headers and auxiliary files for developing with %{name}.
%prep
%setup -q -n %{name}-%{version}
%patch0001 -p1
%build
cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \
@ -869,6 +871,9 @@ exit 0
%endif
%changelog
* Wed Aug 14 2019 Kaleb S. KEITHLEY <kkeithle at redhat.com> - 2.8.2-4
- nfs-ganesha 2.8.2, #1741023
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 2.8.2-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild