diff --git a/0001_src_scripts_ganeshactl_CMakeLists.txt.patch b/0001_src_scripts_ganeshactl_CMakeLists.txt.patch index 9943436..3d05dec 100644 --- a/0001_src_scripts_ganeshactl_CMakeLists.txt.patch +++ b/0001_src_scripts_ganeshactl_CMakeLists.txt.patch @@ -1,10 +1,10 @@ ---- nfs-ganesha-2.7.3/src/scripts/ganeshactl/CMakeLists.txt.orig 2019-05-16 11:24:41.621105054 -0400 -+++ nfs-ganesha-2.7.3/src/scripts/ganeshactl/CMakeLists.txt 2019-05-16 11:24:51.351105054 -0400 +--- nfs-ganesha-2.7.4/src/scripts/ganeshactl/CMakeLists.txt.orig 2019-06-05 17:58:40.943933814 -0400 ++++ nfs-ganesha-2.7.4/src/scripts/ganeshactl/CMakeLists.txt 2019-06-05 17:59:26.653933814 -0400 @@ -1,6 +1,6 @@ # Building and packaging DBUS scripts for ganesha --find_program(PYTHON "python") -+find_program(PYTHON "python2") +-find_program(PYTHON NAMES "python" "python3") ++find_program(PYTHON NAMES "python2") # PyQT based class modules set(GANESHA_BASE_SRCS diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index cf5124b..699fc20 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -80,7 +80,7 @@ Requires: openSUSE-release %bcond_with jemalloc -%bcond_without lttng +%bcond_with lttng %global use_lttng %{on_off_switch lttng} %bcond_without utils @@ -127,14 +127,14 @@ Requires: openSUSE-release #%%global dash_dev_version 2.6-rc5 Name: nfs-ganesha -Version: 2.7.3 -Release: 4%{?dev:%{dev}}%{?dist} +Version: 2.7.4 +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 -Patch1: 0001_src_scripts_ganeshactl_CMakeLists.txt.patch +Patch1: 0001_src_scripts_ganeshactl_CMakeLists.txt.patch BuildRequires: cmake BuildRequires: bison @@ -164,7 +164,7 @@ BuildRequires: libwbclient-devel %endif BuildRequires: gcc-c++ %if ( %{with_system_ntirpc} ) -BuildRequires: libntirpc-devel >= 1.7.2 +BuildRequires: libntirpc-devel >= 1.7.4 %else Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif @@ -278,7 +278,6 @@ Requires: PyQt4 BuildRequires: python2-devel Requires: nfs-ganesha = %{version}-%{release}, python %else -BuildRequires: python-unversioned-command BuildRequires: python2-devel Requires: nfs-ganesha = %{version}-%{release}, python2 %endif @@ -851,6 +850,9 @@ exit 0 %endif %changelog +* Wed Jun 5 2019 Kaleb S. KEITHLEY - 2.7.4-1 +- nfs-ganesha 2.7.4 GA + * Fri May 17 2019 Miro HronĨok - 2.7.3-4 - Avoid unversioned Python requires diff --git a/sources b/sources index 9f4e819..94c5021 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ SHA512 (nfs-ganesha-2.7.3.tar.gz) = 9259860502ad77aec105a1d3ae5d37f34db39227c100b74fd88a6b1a45d517b290baf12538f8bc939ae4c04e07b9022ce617c31d956f69afe36cc91baf702164 +SHA512 (nfs-ganesha-2.7.4.tar.gz) = 8b8d4fd3bfc332922c9e914df1aa757de4bf24cd8508a892d697c274b285933c94090e3aaf47cd5c2a672c090bd2187b2211535cba4c433e2a658397ce51b1b5