From 69821efcd606e72b8c07aa293730de199a4c283c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 21 Aug 2017 11:00:54 -0400 Subject: [PATCH 1/2] 3.11.3 GA --- glusterfs.spec | 30 ++++++++++++++++++------------ sources | 2 +- 2 files changed, 19 insertions(+), 13 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index a15c948..ef82d30 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -111,6 +111,9 @@ %if ( 0%{?rhel} && 0%{?rhel} < 7 ) %{!?python2_sitelib: %global python2_sitelib %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")} %{!?python2_sitearch: %global python2_sitearch %(python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} +%global _rundir %{_localstatedir}/run +%else +%global _rundir /run %endif %if ( 0%{?_with_systemd:1} ) @@ -179,12 +182,12 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 3.11.2 -Release: 3%{?prereltag:.%{prereltag}}%{?dist} +Version: 3.11.3 +Release: 1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ -Release: 0.@PACKAGE_RELEASE@%{?dist}.6 +Release: 0.@PACKAGE_RELEASE@%{?dist}.5 %endif License: GPLv2 or LGPLv3+ Group: System Environment/Base @@ -228,7 +231,7 @@ BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel BuildRequires: libaio-devel libacl-devel BuildRequires: python2-devel -%if ( 0%{?rhel} ) +%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) BuildRequires: python-ctypes %endif BuildRequires: userspace-rcu-devel >= 0.7 @@ -404,7 +407,7 @@ Group: Applications/File # site-packages area Requires: python2-gluster = %{version}-%{release} Requires: python2 -%if ( 0%{?rhel} ) +%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) BuildRequires: python-ctypes %endif @@ -453,7 +456,7 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: python2 Requires: python-prettytable -%if ( 0%{?rhel} ) +%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) BuildRequires: python-ctypes %endif Requires: python2-gluster = %{version}-%{release} @@ -731,7 +734,7 @@ install -D -p -m 0755 %{SOURCE6} \ mkdir -p %{buildroot}%{_localstatedir}/log/glusterd mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd -mkdir -p %{buildroot}%{_localstatedir}/run/gluster +mkdir -p %{buildroot}%{_rundir}/gluster # Remove unwanted files from all the shared libraries find %{buildroot}%{_libdir} -name '*.a' -delete @@ -915,7 +918,7 @@ if [ $? -eq 0 ]; then #Cleaning leftover glusterd socket file which is created by glusterd in #rpm_script_t context. - rm -rf /var/run/glusterd.socket + rm -f %{_rundir}/glusterd.socket # glusterd _was_ running, we killed it, it exited after *.upgrade=on, # so start it again @@ -925,7 +928,7 @@ else #Cleaning leftover glusterd socket file which is created by glusterd in #rpm_script_t context. - rm -rf /var/run/glusterd.socket + rm -f %{_rundir}/glusterd.socket fi exit 0 @@ -934,7 +937,7 @@ exit 0 ## %pre getent group gluster > /dev/null || groupadd -r gluster -getent passwd gluster > /dev/null || useradd -r -g gluster -d /var/run/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster +getent passwd gluster > /dev/null || useradd -r -g gluster -d %{_rundir}/gluster -s /sbin/nologin -c "GlusterFS daemons" gluster exit 0 ##----------------------------------------------------------------------------- @@ -1057,7 +1060,7 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/nl-cache.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/system/posix-acl.so -%dir %attr(0775,gluster,gluster) %{_localstatedir}/run/gluster +%dir %attr(0775,gluster,gluster) %{_rundir}/gluster %if 0%{?_tmpfilesdir:1} %{_tmpfilesdir}/gluster.conf %endif @@ -1343,7 +1346,7 @@ exit 0 %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S30samba-stop.sh %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/stop/pre/S29CTDB-teardown.sh -%ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options +%config(noreplace) %ghost %attr(0600,-,-) %{_sharedstatedir}/glusterd/options %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/peers %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/quotad %ghost %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/scrub @@ -1387,6 +1390,9 @@ exit 0 %endif %changelog +* Mon Aug 21 2017 Kaleb S. KEITHLEY - 3.11.3-1 +- 3.11.3 GA + * Wed Aug 02 2017 Fedora Release Engineering - 3.11.2-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild diff --git a/sources b/sources index 85cbf9e..ad79895 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-3.11.2.tar.gz) = 98dec5d50f17adcb37a928172b84711b4214cab869141c777eb78415fe997924c9d6ba5fe871e94d2dc4eabf23f8a125643fa4c16af1565553e15092b5c26c88 +SHA512 (glusterfs-3.11.3.tar.gz) = a4ef8717873283fce6bc21ef5c6950e92706b473c1148e7d3e82bf57b348d70bcb3c8e6744aa3aed3a4f036869383d99cd29c21bd7b67b478a958ea374165eb6 From 0c05a6df7d4bda9d75ca43f811d0b3406cb4bd67 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 22 Aug 2017 09:06:50 -0400 Subject: [PATCH 2/2] 3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel --- glusterfs.spec | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index ef82d30..dd61e4b 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -26,7 +26,7 @@ %{?_without_rdma:%global _without_rdma --disable-ibverbs} # No RDMA Support on s390(x) -%ifarch s390 s390x +%ifarch s390 s390x armv7hl %global _without_rdma --disable-ibverbs %endif @@ -183,7 +183,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.11.3 -Release: 1%{?prereltag:.%{prereltag}}%{?dist} +Release: 2%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -545,8 +545,12 @@ Obsoletes: python-gluster < 3.10 %package rdma Summary: GlusterFS rdma support for ib-verbs Group: Applications/File +%if ( 0%{?fedora} && 0%{?fedora} > 26 ) +BuildRequires: rdma-core-devel +%else BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel >= 1.0.15 +%endif Requires: %{name} = %{version}-%{release} %description rdma @@ -1390,6 +1394,9 @@ exit 0 %endif %changelog +* Tue Aug 22 2017 Kaleb S. KEITHLEY - 3.11.3-2 +- 3.11.3 libibverbs-devel, librdmacm-devel -> rdma-core-devel + * Mon Aug 21 2017 Kaleb S. KEITHLEY - 3.11.3-1 - 3.11.3 GA