From 2ff76cf9f328585943db08a083131ed4e1e93eea Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 5 Oct 2018 13:20:02 -0400 Subject: [PATCH] 5.0 RC1 Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 81 +++++++++----------------------------------------- sources | 2 +- 2 files changed, 15 insertions(+), 68 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 84b665f..782870d 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 rc0 +%global prereltag rc1 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -23,10 +23,6 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without bd %{?_without_bd:%global _without_bd --disable-bd-xlator} -%if ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} ) -%global _without_bd --disable-bd-xlator -%endif - # cmocka # if you wish to compile an rpm with cmocka unit testing... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with cmocka @@ -52,11 +48,6 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without georeplication %{?_without_georeplication:%global _without_georeplication --disable-georeplication} -# Disable geo-replication on EL5, as its default Python is too old -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -%global _without_georeplication --disable-georeplication -%endif - # gnfs # if you wish to compile an rpm with the legacy gNFS server xlator # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with gnfs @@ -116,12 +107,6 @@ %global _without_syslog --disable-syslog %endif -# tier -# Disable data-tiering on EL5, sqlite is too old -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -%global _without_tiering --disable-tiering -%endif - # valgrind # if you wish to compile an rpm to run all processes under valgrind... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with valgrind @@ -145,11 +130,6 @@ %global _with_tmpfilesdir --without-tmpfilesdir %endif -# Eventing -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -%global _without_events --disable-events -%endif - # without server should also disable some server-only components %if ( 0%{?_without_server:1} ) %global _without_events --disable-events @@ -207,11 +187,6 @@ %{!?_pkgdocdir: %global _pkgdocdir %{_docdir}/%{name}-%{version}} -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -# _sharedstatedir is not provided by RHEL5 -%global _sharedstatedir /var/lib -%endif - # We do not want to generate useless provides and requires for xlator # .so files to be set for glusterfs packages. # Filter all generated: @@ -236,7 +211,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 5.0 -Release: %{?prereltag:0.}3%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:0.}4%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -287,11 +262,7 @@ BuildRequires: userspace-rcu-devel >= 0.7 %if ( 0%{?rhel} && 0%{?rhel} < 7 ) BuildRequires: automake %endif -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -BuildRequires: e2fsprogs-devel -%else BuildRequires: libuuid-devel -%endif %if ( 0%{?_with_cmocka:1} ) BuildRequires: libcmocka-devel >= 1.0.1 %endif @@ -624,10 +595,6 @@ regression testing of Gluster. %package resource-agents Summary: OCF Resource Agents for GlusterFS License: GPLv3+ -%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 || 0%{?sles_version} ) ) -# EL5 does not support noarch sub-packages -BuildArch: noarch -%endif # for glusterd Requires: %{name}-server = %{version}-%{release} # depending on the distribution, we need pacemaker or resource-agents @@ -682,9 +649,6 @@ Requires: rpcbind %else Requires: portmap %endif -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -Obsoletes: %{name}-geo-replication = %{version}-%{release} -%endif %if ( 0%{?rhel} && 0%{?rhel} < 7 ) Requires: python-argparse %endif @@ -712,19 +676,14 @@ This package provides the glusterfs server daemon. %prep %setup -q -n %{name}-%{version}%{?prereltag} -# jenkins release(-new) job (running on CentOS 7) did `./autogen.sh; -# ./configure; make dist`, and the python shebangs were borked. -# this is a temporary work-around -echo "unborking python shebangs..." -for f in api events extras geo-replication libglusterfs tests tools xlators; do -find $f -type f -exec sed -i 's|/usr/bin/python2|/usr/bin/python3|' {} \; +%if ( ! %{_usepython3} ) +echo "fixing python shebangs..." +for f in api events extras geo-replication libglusterfs tools xlators; do +find $f -type f -exec sed -i 's|/usr/bin/python3|/usr/bin/python2|' {} \; done +%endif %build -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -CFLAGS=-DUSE_INSECURE_OPENSSL -export CFLAGS -%endif sed -i -e 's/--quiet//' configure.ac ./autogen.sh && %configure \ @@ -755,6 +714,7 @@ sed -i 's| \\\$compiler_flags |&\\\$LDFLAGS |' libtool sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|' libtool sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|' libtool +gcc -v make %{?_smp_mflags} V=1 %check @@ -777,13 +737,6 @@ install -D -p -m 0644 extras/glusterd-sysconfig \ %endif %endif -%if ( 0%{_for_fedora_koji_builds} ) -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -install -D -p -m 0755 %{SOURCE6} \ - %{buildroot}%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules -%endif -%endif - mkdir -p %{buildroot}%{_localstatedir}/log/glusterd mkdir -p %{buildroot}%{_localstatedir}/log/glusterfs mkdir -p %{buildroot}%{_localstatedir}/log/glusterfsd @@ -810,17 +763,11 @@ https://forge.gluster.org/glusterfs-core/glusterfs/commits/v%{version}%{?prerelt EOM # Remove benchmarking and other unpackaged files -%if ( 0%{?rhel} && 0%{?rhel} < 6 ) -rm -rf %{buildroot}/benchmarking -rm -f %{buildroot}/glusterfs-mode.el -rm -f %{buildroot}/glusterfs.vim -%else # make install always puts these in %%{_defaultdocdir}/%%{name} so don't # use %%{_pkgdocdir}; that will be wrong on later Fedora distributions rm -rf %{buildroot}%{_defaultdocdir}/%{name}/benchmarking rm -f %{buildroot}%{_defaultdocdir}/%{name}/glusterfs-mode.el rm -f %{buildroot}%{_defaultdocdir}/%{name}/glusterfs.vim -%endif %if ( 0%{!?_without_server:1} ) # Create working directory @@ -1100,11 +1047,8 @@ exit 0 %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/io-stats.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/sink.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/debug/trace.so -%if ( ! ( 0%{?rhel} && 0%{?rhel} < 6 ) ) -# RHEL-5 based distributions have a too old openssl %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/encryption/crypt.so -%endif %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/access-control.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/barrier.so @@ -1497,13 +1441,16 @@ exit 0 %endif %changelog -* Mon Sep 24 2018 Kaleb S. KEITHLEY - 5.0rc0-0.3 +* Fri Oct 5 2018 Kaleb S. KEITHLEY - 5.0-0.4.rc1 +- 5.0 RC1 + +* Mon Sep 24 2018 Kaleb S. KEITHLEY - 5.0-0.3.rc0 - 5.0 RC0, unbork python shebangs -* Thu Sep 20 2018 Kaleb S. KEITHLEY - 5.0rc0-0.2 +* Thu Sep 20 2018 Kaleb S. KEITHLEY - 5.0-0.2.rc0 - 5.0 RC0 -* Tue Sep 18 2018 Kaleb S. KEITHLEY - 5.0rc0-0.1 +* Tue Sep 18 2018 Kaleb S. KEITHLEY - 5.0-0.1.rc0 - 5.0 RC0 * Thu Sep 6 2018 Kaleb S. KEITHLEY - 4.1.4-1 diff --git a/sources b/sources index 9af4727..273e159 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-5.0rc0.tar.gz) = 70e7cc94885b3646f4f995eb6cfe4e589c7b18473471375e6f4ebb279d784a0b155cd5e440cd928d5482e80f131d63149b1e01fad5629b103ad99c8dd2c7f83e +SHA512 (glusterfs-5.0rc1.tar.gz) = 0cebb22df34a6dab9729d00d5afbfa03a4858fbd8af8db225f02997c238cc59b9b3feceaace4a2cead1a0a7ce82d01faeb55ba3afd363fab2eeae7864146ce3f