From f715df042f74a0010d45a36d61f7d661828abcc4 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 1 Mar 2018 08:11:21 -0500 Subject: [PATCH 01/10] python2-prettytable, .../rpms/pull-request/3 Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 471c082..ed594ad 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -184,7 +184,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 3.13.2 -Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:0.}3%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -366,7 +366,7 @@ This package provides the development libraries and include files. %package events Summary: GlusterFS Events Requires: %{name}-server%{?_isa} = %{version}-%{release} -Requires: python2 python-prettytable +Requires: python2 python2-prettytable Requires: python2-gluster = %{version}-%{release} %if ( 0%{?rhel} ) Requires: python-requests @@ -446,7 +446,7 @@ Summary: GlusterFS Geo-replication Requires: %{name} = %{version}-%{release} Requires: %{name}-server = %{version}-%{release} Requires: python2 -Requires: python-prettytable +Requires: python2-prettytable %if ( 0%{?rhel} && 0%{?rhel} <= 7 ) BuildRequires: python-ctypes %endif @@ -1367,6 +1367,9 @@ exit 0 %endif %changelog +* Thu Mar 1 2018 Kaleb S. KEITHLEY - 3.13.2-3 +- python2-prettytable, .../rpms/pull-request/3 + * Thu Feb 15 2018 Kaleb S. KEITHLEY - 3.13.2-2 - shared lib scriptlets, ldconfig From 3f40993f330d6c67c817a69d83fee7fd40160de3 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 21 Mar 2018 11:47:58 -0400 Subject: [PATCH 02/10] 4.0.1 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/glusterfs.spec b/glusterfs.spec index 273cea8..57f37d0 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -83,6 +83,11 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma %{?_without_rdma:%global _without_rdma --disable-ibverbs} +# No RDMA Support on s390(x) +%ifarch s390 s390x %{arm} +%global _without_rdma --disable-ibverbs +%endif + # server # if you wish to build rpms without server components, compile like this # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server From 3821878d36c545abb02448f054b2dd15b7688d6d Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 24 Apr 2018 17:01:22 +0200 Subject: [PATCH 03/10] 4.0.2 GA Signed-off-by: Niels de Vos --- glusterfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 603a178..81a986a 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -221,8 +221,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 4.0.1 -Release: %{?prereltag:0.}3%{?prereltag:.%{prereltag}}%{?dist} +Version: 4.0.2 +Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1451,6 +1451,9 @@ exit 0 %endif %changelog +* Tue Apr 24 2018 Niels de Vos - 4.0.2-1 +- 4.0.2 GA + * Thu Apr 19 2018 Kaleb S. KEITHLEY - 4.0.1-3 - 4.0.1, restore python->python2 -prettytable diff --git a/sources b/sources index 23d2fb1..7ac1e3e 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-4.0.1.tar.gz) = 1eb2d088ab9235866054ce05a9195ddfc8e961ec062aa03bddfbd9b3dc47867d7e0759e08bc95d4eec482920bef40ac7e380f930659fb5be6c5fac196e7c7ec9 +SHA512 (glusterfs-4.0.2.tar.gz) = 33afed4fb4f6d63f1d2b7caedae1ce41e7f6aa4299fb4a7ee2f5e4bc14c97d66f68097171fded6d1f2141dd7127eb408596cce4f5f7287038a14e387ad5ec5e6 From 84a2b920b647e3fa1edb903da2b00d94810ca91c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 24 Jul 2018 15:51:15 -0400 Subject: [PATCH 04/10] 4.1.2 GA (includes gsyncd.conf) Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 02a4c2f..0c5d290 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -217,7 +217,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 4.1.2 -Release: %{?prereltag:0.}2%{?prereltag:.%{prereltag}}%{?dist}.1 +Release: %{?prereltag:0.}1%{?prereltag:.%{prereltag}}%{?dist}.1 %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1442,11 +1442,8 @@ exit 0 %endif %changelog -* Tue Jul 24 2018 Kaleb S. KEITHLEY - 4.1.2-2 -- 4.1.2, gsyncd.conf /usr/local/sbin - * Tue Jul 24 2018 Kaleb S. KEITHLEY - 4.1.2-1 -- 4.1.2 GA +- 4.1.2 GA (includes gsyncd.conf) * Fri Jul 13 2018 Fedora Release Engineering - 4.1.1-2.1 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 93d8f17fbcb55515141807edee74163a0b004eae Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 21 Sep 2018 11:38:19 -0400 Subject: [PATCH 05/10] 4.1.5 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 2019fdc..83df20a 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -217,7 +217,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 4.1.4 +Version: 4.1.5 Release: %{?prereltag:1.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1444,6 +1444,9 @@ exit 0 %endif %changelog +* Fri Sep 21 2018 Kaleb S. KEITHLEY - 4.1.5-1 +- 4.1.5 GA + * Thu Sep 6 2018 Kaleb S. KEITHLEY - 4.1.4-1 - 4.1.4 GA diff --git a/sources b/sources index 568f205..fa24cc5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-4.1.4.tar.gz) = 7ef82170c9025ea74867382acc17e4fde55af82d4b04138fb74800c3fc28f018f9ec493069fd14961310dece6cb386973fb07e00d5cad59a9aaf6020155cba56 +SHA512 (glusterfs-4.1.5.tar.gz) = ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f From 1fd3341f491ce2fe8f87a2a332e76fc91f11d511 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Wed, 14 Nov 2018 13:42:10 -0500 Subject: [PATCH 06/10] 4.1.6 GA Signed-off-by: Kaleb S. KEITHLEY --- ...x-hard-coded-paths-in-gsyncd.conf.in.patch | 38 ------------------- glusterfs.spec | 9 +++-- sources | 2 +- 3 files changed, 7 insertions(+), 42 deletions(-) delete mode 100644 0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch diff --git a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch b/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch deleted file mode 100644 index c2229f1..0000000 --- a/0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a0a0afc59bb1d2deddfdb776bc9e49e02f58ce32 Mon Sep 17 00:00:00 2001 -From: "Kaleb S. KEITHLEY" -Date: Tue, 24 Jul 2018 14:40:51 -0400 -Subject: [PATCH] georep: fix hard-coded paths in gsyncd.conf.in - -Why anyone puts a hard-coded path like /usr/local/sbin in a -config file is beyond me. - -I wonder how many more are lurking in our sources - -Change-Id: I6523894416cc06236ea1f99529efd36e957bd98e -updates: bz#1193929 -Signed-off-by: Kaleb S. KEITHLEY ---- - geo-replication/gsyncd.conf.in | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/geo-replication/gsyncd.conf.in b/geo-replication/gsyncd.conf.in -index 0a842cf2b..bd04400ff 100644 ---- a/geo-replication/gsyncd.conf.in -+++ b/geo-replication/gsyncd.conf.in -@@ -138,11 +138,11 @@ value = - help=If SSH keys are not secured with gsyncd prefix then use this configuration to set the actual path of gsyncd(Usually /usr/libexec/glusterfs/gsyncd) - - [gluster-command-dir] --value=/usr/local/sbin/ -+value=@SBIN_DIR@ - help=Directory where Gluster binaries exist on master - - [slave-gluster-command-dir] --value=/usr/local/sbin/ -+value=@SBIN_DIR@ - help=Directory where Gluster binaries exist on slave - - [gluster-params] --- -2.17.1 - diff --git a/glusterfs.spec b/glusterfs.spec index 83ba106..08c4f09 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -217,7 +217,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 4.1.5 +Version: 4.1.6 Release: %{?prereltag:1.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -229,7 +229,6 @@ URL: http://docs.gluster.org/ %if ( 0%{_for_fedora_koji_builds} ) Source0: http://download.gluster.org/pub/gluster/%{name}/4.1/%{version}%{?prereltag}/%{name}-%{version}%{?prereltag}.tar.gz Patch0: python.patch -Patch1: 0001-georep-fix-hard-coded-paths-in-gsyncd.conf.in.patch Source1: glusterd.sysconfig Source2: glusterfsd.sysconfig Source6: rhel5-load-fuse-modules @@ -691,7 +690,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 ) @@ -1331,7 +1329,9 @@ exit 0 %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/protocol/server.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage +%if ( 0%{!?_without_bd:1} ) %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/bd.so +%endif %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/storage/posix.so %dir %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance %{_libdir}/glusterfs/%{version}%{?prereltag}/xlator/performance/decompounder.so @@ -1444,6 +1444,9 @@ exit 0 %endif %changelog +* Wed Nov 14 2018 Kaleb S. KEITHLEY - 4.1.6-1 +- 4.1.6 GA + * Fri Sep 21 2018 Kaleb S. KEITHLEY - 4.1.5-1 - 4.1.5 GA diff --git a/sources b/sources index fa24cc5..4effca7 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-4.1.5.tar.gz) = ae557472b6a263e815b8c4d630b606f8e1334b6604799e499e6f53ea6ff60c2a696160fa427943cc3d01ffee91a57787c91f93a1b914179679038e63d291401f +SHA512 (glusterfs-4.1.6.tar.gz) = d5edcaa3abf20469163796d8a37b0bef59061e13885d082f26e8e62bf738e1c71a610ab14478261940f0f696ffd7dea2f061280ec37ebc6f508a110ed520cd4e From d52b8fee5eb9c7d6b80d60162b95b609f7d3435f Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 17 Jan 2019 08:15:41 -0500 Subject: [PATCH 07/10] 4.1.6 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 5 ++++- sources | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 08c4f09..5dc0a78 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -217,7 +217,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 4.1.6 +Version: 4.1.7 Release: %{?prereltag:1.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1444,6 +1444,9 @@ exit 0 %endif %changelog +* Thu Dec 17 2018 Kaleb S. KEITHLEY - 4.1.7-1 +- 4.1.6 GA + * Wed Nov 14 2018 Kaleb S. KEITHLEY - 4.1.6-1 - 4.1.6 GA diff --git a/sources b/sources index 4effca7..000b5bb 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-4.1.6.tar.gz) = d5edcaa3abf20469163796d8a37b0bef59061e13885d082f26e8e62bf738e1c71a610ab14478261940f0f696ffd7dea2f061280ec37ebc6f508a110ed520cd4e +SHA512 (glusterfs-4.1.7.tar.gz) = 3cfdb50df98085ab50d33bb8d7c735763bed5b6a5f50fc8a5692beff89b176782b08f67198675357aed289c1f89e278bfd2dded0a255c770011031df287ceb5a From 16cab8fc25937697223f2cbda838e96d4b4c5018 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 17 Jan 2019 08:54:24 -0500 Subject: [PATCH 08/10] 4.1.7 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 5dc0a78..c1a56ba 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -218,7 +218,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 4.1.7 -Release: %{?prereltag:1.}1%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:1.}2%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1444,8 +1444,8 @@ exit 0 %endif %changelog -* Thu Dec 17 2018 Kaleb S. KEITHLEY - 4.1.7-1 -- 4.1.6 GA +* Thu Jan 17 2019 Kaleb S. KEITHLEY - 4.1.7-2 +- 4.1.7 GA * Wed Nov 14 2018 Kaleb S. KEITHLEY - 4.1.6-1 - 4.1.6 GA From 4afe63595ccc39cf7f5d0a139ef39b2ca5bba287 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Fri, 1 Mar 2019 09:05:25 -0500 Subject: [PATCH 09/10] 4.1.7 s390x, armv7hl no rdma Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/glusterfs.spec b/glusterfs.spec index c1a56ba..6607843 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -83,6 +83,11 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without rdma %{?_without_rdma:%global _without_rdma --disable-ibverbs} +# No RDMA Support on s390(x) +%ifarch s390 s390x armv7hl +%global _without_rdma --disable-ibverbs +%endif + # server # if you wish to build rpms without server components, compile like this # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without server @@ -218,7 +223,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 4.1.7 -Release: %{?prereltag:1.}2%{?prereltag:.%{prereltag}}%{?dist} +Release: %{?prereltag:1.}3%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1444,6 +1449,9 @@ exit 0 %endif %changelog +* Fri Mar 1 2019 Kaleb S. KEITHLEY - 4.1.7-3 +- 4.1.7 s390x, armv7hl no rdma + * Thu Jan 17 2019 Kaleb S. KEITHLEY - 4.1.7-2 - 4.1.7 GA From dd09603027aba76ae38cbdba98f98bcaa34d0f8d Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 28 Mar 2019 06:45:52 -0400 Subject: [PATCH 10/10] 4.1.8 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 6607843..9597a3e 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -222,8 +222,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 4.1.7 -Release: %{?prereltag:1.}3%{?prereltag:.%{prereltag}}%{?dist} +Version: 4.1.8 +Release: %{?prereltag:1.}1%{?prereltag:.%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1449,6 +1449,9 @@ exit 0 %endif %changelog +* Thu Mar 28 2019 Kaleb S. KEITHLEY - 4.1.8-1 +- 4.1.8 GA + * Fri Mar 1 2019 Kaleb S. KEITHLEY - 4.1.7-3 - 4.1.7 s390x, armv7hl no rdma diff --git a/sources b/sources index 000b5bb..0e79e2f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-4.1.7.tar.gz) = 3cfdb50df98085ab50d33bb8d7c735763bed5b6a5f50fc8a5692beff89b176782b08f67198675357aed289c1f89e278bfd2dded0a255c770011031df287ceb5a +SHA512 (glusterfs-4.1.8.tar.gz) = 950cd2fd774e3eb00f1ec06d54566736b6fbe8d1aed54477a19d9b2727eff8a70ef7ac32815cc7e01d45b5d357fc01af786e16c451f6ad314d472e61ba04ce85