diff --git a/nfs-ganesha.spec b/nfs-ganesha.spec index d542b4d..56db66a 100644 --- a/nfs-ganesha.spec +++ b/nfs-ganesha.spec @@ -95,18 +95,18 @@ Requires: openSUSE-release %endif %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 rc5 -%global dash_dev_version 2.6-rc5 +#%%global dev rc5 +#%%global dash_dev_version 2.6-rc5 Name: nfs-ganesha Version: 2.6.0 -Release: 0.5%{?dev:%{dev}}%{?dist} +Release: 1%{?dev:%{dev}}%{?dist} Summary: NFS-Ganesha is a NFS Server running in user space Group: Applications/System License: LGPLv3+ 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%{version}/%{name}-%{version}.tar.gz BuildRequires: cmake BuildRequires: bison @@ -129,7 +129,7 @@ BuildRequires: libblkid-devel BuildRequires: libuuid-devel BuildRequires: gcc-c++ %if %{with system_ntirpc} -BuildRequires: libntirpc-devel >= 1.6.0 +BuildRequires: libntirpc-devel = 1.6.1 %else Requires: libntirpc = @NTIRPC_VERSION_EMBED@ %endif @@ -405,7 +405,7 @@ Development headers and auxiliary files for developing with %{name}. %endif %prep -%setup -q -n %{name}-%{dash_dev_version} +%setup -q -n %{name}-%{version} %build cd src && %cmake . -DCMAKE_BUILD_TYPE=RelWithDebInfo \ @@ -729,6 +729,9 @@ exit 0 %endif %changelog +* Tue Feb 20 2018 Kaleb S. KEITHLEY 2.6.0-1 +- nfs-ganesha 2.6.0 GA + * Tue Feb 20 2018 Kaleb S. KEITHLEY 2.6.0-0.5rc5 - nfs-ganesha 2.6.0 RC5, rebuild with libntirpc-1.6.1 diff --git a/sources b/sources index 81ae7ec..1636f24 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nfs-ganesha-2.6-rc5.tar.gz) = 40ac1854e3c6d93283142b2b98f8d260380bc08c9a9760392ef7004a1abf6b8fea468a4f355cdcbe61071c8a8141650771861596f95eab3f8ba225095ef1c791 +SHA512 (nfs-ganesha-2.6.0.tar.gz) = 37de73ba736a8fe8cc6ddcbc0666e7b3a60c8f3dbfc90e4bed40f92d33d6da8f169d5e3801bcc5f5c0fc649a966f4ae7ec14d3ffc01552c2726a6c2efdc72d91