From 76e44828a59e25341f6e211c8fdc8c5734b346d2 Mon Sep 17 00:00:00 2001 From: Kaleb S. KEITHLEY Date: Jun 12 2018 17:36:06 +0000 Subject: 4.1.0 GA Signed-off-by: Kaleb S. KEITHLEY --- diff --git a/glusterfs.spec b/glusterfs.spec index d94d0ef..394155b 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 rc1 +# %%global prereltag rc0 ##----------------------------------------------------------------------------- ## All argument definitions should be placed here and keep them sorted @@ -69,7 +69,7 @@ # Do not use libtirpc on EL6, it does not have xdr_uint64_t() and xdr_uint32_t # Do not use libtirpc on EL7, it does not have xdr_sizeof() -%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) +%if ( 0%{?rhel} && 0%{?rhel} < 8 ) %global _without_libtirpc --without-libtirpc %endif @@ -78,7 +78,7 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without ocf %{?_without_ocf:%global _without_ocf --without-ocf} -#rdma +# rdma # if you wish to compile an rpm without rdma support, compile like this... # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma %{?_without_rdma:%global _without_rdma --disable-ibverbs} @@ -89,7 +89,7 @@ %{?_without_server:%global _without_server --without-server} # disable server components forcefully as rhel <= 6 -%if ( 0%{?rhel} && 0%{?rhel} <= 6 ) +%if ( 0%{?rhel} && 0%{?rhel} < 7 ) %global _without_server --without-server %endif @@ -102,7 +102,7 @@ # Fedora deprecated syslog, see # https://fedoraproject.org/wiki/Changes/NoDefaultSyslog # (And what about RHEL7?) -%if ( ( 0%{?fedora} && 0%{?fedora} >= 20 ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) ) +%if ( ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} < 7 ) ) %global _without_syslog --disable-syslog %endif @@ -216,7 +216,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 4.0.2 +Version: 4.1.0 Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -226,7 +226,7 @@ Release: 0.@PACKAGE_RELEASE@%{?dist}.5 License: GPLv2 or LGPLv3+ URL: http://docs.gluster.org/ %if ( 0%{_for_fedora_koji_builds} ) -Source0: http://download.gluster.org/pub/gluster/%{name}/4.0/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz +Source0: http://download.gluster.org/pub/gluster/%{name}/4.1/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig Source6: rhel5-load-fuse-modules @@ -239,7 +239,7 @@ Source0: @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz Requires(pre): shadow-utils %if ( 0%{?rhel} && 0%{?rhel} < 6 ) -BuildRequires: python-simplejson +BuildRequires: python2-simplejson %endif %if ( 0%{?_with_systemd:1} ) BuildRequires: systemd @@ -255,10 +255,10 @@ BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel BuildRequires: libaio-devel libacl-devel BuildRequires: python2-devel -%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) +%if ( 0%{?rhel} && 0%{?rhel} < 8 ) BuildRequires: python-ctypes %endif -%if ( 0%{?_with_ipv6default:1} || 0%{!?_without_libtirpc:1} ) +%if ( ( 0%{?_with_ipv6default:1} ) || ( 0%{!?_without_libtirpc:1} ) ) BuildRequires: libtirpc-devel %endif %if ( 0%{?fedora} && 0%{?fedora} > 27 ) @@ -433,9 +433,6 @@ Summary: Extra Gluster filesystem Translators # site-packages area Requires: python2-gluster = %{version}-%{release} Requires: python2 -%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) -BuildRequires: python-ctypes -%endif %description extra-xlators GlusterFS is a distributed file-system capable of scaling to several @@ -480,9 +477,6 @@ Requires: %{name} = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: python2 Requires: python2-prettytable -%if ( 0%{?rhel} && 0%{?rhel} <= 7 ) -BuildRequires: python-ctypes -%endif Requires: python2-gluster = %{version}-%{release} Requires: rsync @@ -658,7 +652,7 @@ Requires(postun): /sbin/service Requires: firewalld-filesystem %endif %endif -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} ) Requires: rpcbind %else Requires: portmap @@ -666,10 +660,10 @@ Requires: portmap %if ( 0%{?rhel} && 0%{?rhel} < 6 ) Obsoletes: %{name}-geo-replication = %{version}-%{release} %endif -%if ( 0%{?rhel} && 0%{?rhel} <= 6 ) +%if ( 0%{?rhel} && 0%{?rhel} < 7 ) Requires: python-argparse %endif -%if ( 0%{?fedora} && 0%{?fedora} >= 28 ) +%if ( 0%{?fedora} && 0%{?fedora} > 27 ) Requires: python2-pyxattr %else Requires: pyxattr @@ -715,8 +709,8 @@ sed -i -e 's/--quiet//' configure.ac %{?_without_georeplication} \ %{?_without_ocf} \ %{?_without_rdma} \ - %{?_without_syslog} \ %{?_without_server} \ + %{?_without_syslog} \ %{?_without_tiering} \ %{?_with_ipv6default} \ %{?_without_libtirpc} @@ -858,7 +852,7 @@ install -p -m 0755 -D extras/command-completion/gluster.bash \ %post /sbin/ldconfig %if ( 0%{!?_without_syslog:1} ) -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} ) %systemd_postun_with_restart rsyslog %endif %endif @@ -964,7 +958,7 @@ fi exit 0 %endif - ##----------------------------------------------------------------------------- +##----------------------------------------------------------------------------- ## All %%pre should be placed here and keep them sorted ## %pre @@ -1013,7 +1007,7 @@ exit 0 %postun /sbin/ldconfig %if ( 0%{!?_without_syslog:1} ) -%if ( 0%{?fedora} ) || ( 0%{?rhel} && 0%{?rhel} >= 6 ) +%if ( 0%{?fedora} ) || ( 0%{?rhel} ) %systemd_postun_with_restart rsyslog %endif %endif @@ -1082,11 +1076,14 @@ 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/features/utime.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/gfid-access.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/namespace.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/read-only.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/shard.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/snapview-client.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/worm.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/cloudsync.so %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/meta.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/io-cache.so @@ -1179,9 +1176,6 @@ exit 0 %{_bindir}/fusermount-glusterfs %endif %if ( 0%{_for_fedora_koji_builds} ) -%if ( 0%{?rhel} && 0%{?rhel} <= 5 ) -%{_sysconfdir}/sysconfig/modules/glusterfs-fuse.modules -%endif %endif %if ( 0%{?_with_gnfs:1} && 0%{!?_without_server:1} ) @@ -1308,6 +1302,7 @@ exit 0 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/arbiter.so + %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/features/thin-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/features/sdfs.so @@ -1357,8 +1352,9 @@ exit 0 %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/disabled-quota-root-xattr-heal.sh - %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/post/S13create-subdir-mounts.sh %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre + %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/add-brick/pre/S28Quota-enable-root-xattr-heal.sh %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create %dir %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post %attr(0755,-,-) %{_sharedstatedir}/glusterd/hooks/1/create/post/S10selinux-label-brick.sh @@ -1442,6 +1438,12 @@ exit 0 %endif %changelog +* Tue Jun 12 2018 Kaleb S. KEITHLEY - 4.1.0-1 +- 4.1.0 GA + +* Fri Jun 1 2018 Kaleb S. KEITHLEY - 4.1.0rc0 +- 4.1.0 RC0 + * Tue Apr 24 2018 Niels de Vos - 4.0.2-1 - 4.0.2 GA diff --git a/sources b/sources index 7ac1e3e..749100b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-4.0.2.tar.gz) = 33afed4fb4f6d63f1d2b7caedae1ce41e7f6aa4299fb4a7ee2f5e4bc14c97d66f68097171fded6d1f2141dd7127eb408596cce4f5f7287038a14e387ad5ec5e6 +SHA512 (glusterfs-4.1.0.tar.gz) = 4cb84c93dfff7e533fb135f4e0631dd3c7dfb513c1b9ff4f1a23ed92acc1d839965d10b54cf71dbe1a756b09d89f80d6bfb8226956b01438149421102c902e0e