Merge remote-tracking branch 'origin/master' into f25
This commit is contained in:
commit
953e66f4a3
@ -46,7 +46,7 @@ Requires: sles-release >= 12
|
|||||||
%bcond_without ceph
|
%bcond_without ceph
|
||||||
%global use_fsal_ceph %{on_off_switch ceph}
|
%global use_fsal_ceph %{on_off_switch ceph}
|
||||||
|
|
||||||
%bcond_without rgw
|
%bcond_with rgw
|
||||||
%global use_fsal_rgw %{on_off_switch rgw}
|
%global use_fsal_rgw %{on_off_switch rgw}
|
||||||
|
|
||||||
%bcond_without gluster
|
%bcond_without gluster
|
||||||
@ -74,16 +74,15 @@ Requires: sles-release >= 12
|
|||||||
|
|
||||||
Name: nfs-ganesha
|
Name: nfs-ganesha
|
||||||
Version: 2.4.0
|
Version: 2.4.0
|
||||||
%global dev rc3
|
%global dev rc4
|
||||||
%global dash_dev_version 2.4-rc3
|
%global dash_dev_version 2.4-rc4
|
||||||
Release: 0.19%{?dev:%{dev}}%{?dist}
|
Release: 0.20%{?dev:%{dev}}%{?dist}
|
||||||
Summary: NFS-Ganesha is a NFS Server running in user space
|
Summary: NFS-Ganesha is a NFS Server running in user space
|
||||||
Group: Applications/System
|
Group: Applications/System
|
||||||
License: LGPLv3+
|
License: LGPLv3+
|
||||||
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
|
Url: https://github.com/nfs-ganesha/nfs-ganesha/wiki
|
||||||
|
|
||||||
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
|
Source0: https://github.com/%{name}/%{name}/archive/V%{dash_dev_version}/%{name}-%{dash_dev_version}.tar.gz
|
||||||
Patch0: nfs-ganesha-2.4rc3-FSAL_RGW.handle.patch
|
|
||||||
|
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
@ -303,7 +302,6 @@ be used with NFS-Ganesha to support Gluster
|
|||||||
%prep
|
%prep
|
||||||
%setup -q -n %{name}-%{dash_dev_version}
|
%setup -q -n %{name}-%{dash_dev_version}
|
||||||
rm -rf contrib/libzfswrapper
|
rm -rf contrib/libzfswrapper
|
||||||
%patch0 -p1
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \
|
cd src && %cmake . -DCMAKE_BUILD_TYPE=Debug \
|
||||||
@ -548,6 +546,9 @@ killall -SIGHUP dbus-daemon 2>&1 > /dev/null
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Sep 11 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.20rc4
|
||||||
|
- 2.4-rc4
|
||||||
|
|
||||||
* Wed Sep 7 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.19rc3
|
* Wed Sep 7 2016 Kaleb S. KEITHLEY <kkeithle at redhat.com> 2.4.0-0.19rc3
|
||||||
- 2.4-rc3
|
- 2.4-rc3
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user