diff --git a/glusterfs.spec b/glusterfs.spec index 57c029e..11560a7 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -3,7 +3,7 @@ %global _for_fedora_koji_builds 1 # uncomment and add '%' to use the prereltag for pre-releases -%global prereltag rc2 +# global prereltag rc2 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -168,7 +168,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.9.0 -Release: 0.3%{?prereltag:.%{prereltag}}%{?dist} +Release: 1%{?prereltag:.%{prereltag}}%{?dist} Vendor: Fedora Project %else Name: @PACKAGE_NAME@ @@ -189,8 +189,7 @@ Source8: glusterfsd.init %else Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz %endif -Patch0: glusterfs-3.9.0rc2.xlators.crypt.patch -Patch1: glusterfs-3.9.0rc2.api.glfs_free.patch +Patch0: glusterfs-3.9.0rc2.api.glfs_free.patch BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -425,9 +424,9 @@ Requires: pcs, dbus %if ( 0%{?rhel} && 0%{?rhel} == 6 ) Requires: cman, pacemaker, corosync %endif -%if ( 0%{?fedora} ) -# we need portblock resource-agent in 3.9.6 and later. -Requires: resource-agents >= 3.9.6 +%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} > 5 ) +# we need portblock resource-agent in 3.9.5 and later. +Requires: resource-agents >= 3.9.5 %endif %description ganesha @@ -628,7 +627,6 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} %patch0 -p1 -%patch1 -p1 %build %if ( 0%{?rhel} && 0%{?rhel} < 6 ) @@ -988,7 +986,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cdc.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changelog.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/fdl.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so @@ -1030,7 +1027,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/*.so %exclude %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/cluster/pump.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/client.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2c.so %files devel @@ -1178,12 +1174,6 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bit-rot.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/bitrot-stub.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbrc.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/jbr.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/dht2s.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/posix2-ds.so -%{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/experimental/posix2-mds.so -%{_libdir}/libposix2common.so %if ( 0%{!?_without_tiering:1} ) %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/changetimerecorder.so %endif @@ -1281,9 +1271,6 @@ exit 0 %{_prefix}/lib/firewalld/services/glusterfs.xml %endif -%{_sbindir}/gf_logdump -%{_sbindir}/gf_recon - # Events %if ( 0%{!?_without_events:1} ) %files events @@ -1302,6 +1289,10 @@ exit 0 %endif %changelog +* Tue Nov 15 2016 Kaleb S. KEITHLEY - 3.9.0-1 +- 3.9.0 GA +- w/ glfs_free(), needed for nfs-ganesha-2.4.1 w/ patched FSAL_GLUSTER + * Mon Oct 31 2016 Kaleb S. KEITHLEY - 3.9.0-0.3rc2 - glfs_free(), needed for nfs-ganesha-2.4.1 w/ patched FSAL_GLUSTER diff --git a/sources b/sources index 82d6821..5eaf890 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -f15980be6b404008169d512bbc7ebec8 glusterfs-3.9.0rc2.tar.gz +23bb9c65a46ff74c0f1e15b9a8fe20a2 glusterfs-3.9.0.tar.gz