diff --git a/SPECS/glusterfs.spec b/SPECS/glusterfs.spec index 379ec3d..6b50075 100644 --- a/SPECS/glusterfs.spec +++ b/SPECS/glusterfs.spec @@ -94,11 +94,6 @@ # rpmbuild -ta glusterfs-5.0rc0.tar.gz --without server %{?_without_server:%global _without_server --without-server} -# disable server components forcefully as rhel <= 6 -%if ( 0%{?rhel} && 0%{?rhel} <= 6 ) -%global _without_server --without-server -%endif - # syslog # if you wish to build rpms without syslog logging, compile like this # rpmbuild -ta glusterfs-5.0rc0.tar.gz --without syslog @@ -225,7 +220,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 7.0 -Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -276,7 +271,7 @@ BuildRequires: libtirpc-devel %if ( 0%{?fedora} && 0%{?fedora} > 27 ) || ( 0%{?rhel} && 0%{?rhel} > 7 ) BuildRequires: rpcgen %endif -BuildRequires: userspace-rcu-devel >= 0.7 +BuildRequires: userspace-rcu-devel >= 0.10 %if ( 0%{?rhel} && 0%{?rhel} <= 6 ) BuildRequires: automake %endif @@ -1429,6 +1424,12 @@ exit 0 %endif %changelog +* Fri Nov 22 2019 Kaleb S. KEITHLEY - 7.0-2 +- GlusterFS 7.0, enable server again now that glusterd2 is dead + +* Wed Nov 20 2019 Kaleb S. KEITHLEY - 7.0-1 +- GlusterFS 7.0 GA, w/ userspace-rcu 0.10 + * Wed Oct 16 2019 Niels de Vos - 7.0-1 - GlusterFS 7.0 GA