From 52434a56bb0afaff67f48dd41ea4584fb16df503 Mon Sep 17 00:00:00 2001 From: Tamar Shacked Date: Sat, 19 Feb 2022 20:57:32 +0200 Subject: [PATCH] Build V6.0-61.1 for rhel9.0 Fix changlog chronological order after cherry-pick from RHGS-3.5.6 Resolves: bz#2055630 --- glusterfs.spec | 30 +++++++++++++++++------------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 80c7793..e56db48 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -233,11 +233,11 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.8.0 -Release: 0.2%{?prereltag:.%{prereltag}}%{?dist} +Release: 0.1%{?prereltag:.%{prereltag}}%{?dist} %else Name: glusterfs Version: 6.0 -Release: 61%{?dist} +Release: 61.1%{?dist} ExcludeArch: i686 %endif License: GPLv2 or LGPLv3+ @@ -858,13 +858,11 @@ Patch0540: 0540-extras-Disable-write-behind-for-group-samba.patch Patch0541: 0541-glusterd-volgen-Add-functionality-to-accept-any-cust.patch Patch0542: 0542-xlaotrs-mgmt-Fixing-coverity-issue-1445996.patch Patch0543: 0543-glusterd-handle-custom-xlator-failure-cases.patch -Patch0900: 0900-rhel-9.0-beta-build-fixing-gcc-10-and-LTO-errors.patch -Patch0901: 0901-contrib-remove-contrib-sunrpc-xdr_sizeof.c.patch Patch0544: 0544-tests-avoid-empty-paths-in-environment-variables.patch Patch0545: 0545-tests-Excluded-tests-for-unsupported-components.patch Patch0546: 0546-Update-rfc.sh-to-rhgs-3.5.5.patch Patch0547: 0547-perf-write-behind-Clear-frame-local-on-conflict-erro.patch -Patch0548: 0548-Add-tar-as-dependency-to-geo-rep-rpm-for-RHEL-8.3-an.patch +#Patch0548: 0548-Add-tar-as-dependency-to-geo-rep-rpm-for-RHEL-8.3-an.patch Patch0549: 0549-geo-rep-Change-in-attribute-for-getting-function-nam.patch Patch0550: 0550-common-ha-stability-fixes-for-ganesha_grace-and-gane.patch Patch0551: 0551-common-ha-ensure-shared_storage-is-mounted-before-se.patch @@ -926,8 +924,10 @@ Patch0606: 0606-dht-handle-DHT_SUBVOL_STATUS_KEY-in-dht_pt_getxattr-.patch Patch0607: 0607-SELinux-Fix-boolean-management.patch Patch0608: 0608-cluster-ec-Track-heal-statistics-in-shd.patch Patch0609: 0609-feature-shard-wrong-dname-results-in-dentry-not-foun.patch -Patch0610: 0610-glusterfs.spec.in-remove-condtionals-from-tar-depend.patch +#Patch0610: 0610-glusterfs.spec.in-remove-condtionals-from-tar-depend.patch Patch0611: 0611-SELinux-Fix-boolean-management-again.patch +Patch0900: 0900-rhel-9.0-beta-build-fixing-gcc-10-and-LTO-errors.patch +Patch0901: 0901-contrib-remove-contrib-sunrpc-xdr_sizeof.c.patch %description GlusterFS is a distributed file-system capable of scaling to several @@ -2692,6 +2692,17 @@ fi %endif %changelog +* Thu Feb 17 2022 Tamar Shacked - 6.0-61.1 +- Fix changlog chronological order after rebase from RHGS-3.5.6 +- fixes bugs bz#2055630 + +* Mon Nov 29 2021 Gluster Jenkins - 6.0-61 +- fixes bugs bz#1973566 + +* Mon Oct 11 2021 Gluster Jenkins - 6.0-60 +- fixes bugs bz#1668303 bz#1853631 bz#1901468 bz#1904137 bz#1911665 + bz#1962972 bz#1973566 bz#1994593 bz#1995029 bz#1997447 bz#2006205 + * Mon Aug 09 2021 Mohan Boddu - 6.0-57.4 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688 @@ -2705,13 +2716,6 @@ fi - Fix changlog chronological order by removing unneeded changelogs - fixes bug bz#1939340 -* Mon Nov 29 2021 Gluster Jenkins - 6.0-61 -- fixes bugs bz#1973566 - -* Mon Oct 11 2021 Gluster Jenkins - 6.0-60 -- fixes bugs bz#1668303 bz#1853631 bz#1901468 bz#1904137 bz#1911665 - bz#1962972 bz#1973566 bz#1994593 bz#1995029 bz#1997447 bz#2006205 - * Tue Jul 06 2021 Gluster Jenkins - 6.0-59 - fixes bugs bz#1689375