From 06e6ac431606caa2b8320f1f23d349148d83e1ae Mon Sep 17 00:00:00 2001 From: Kaleb S KEITHLEY Date: Tue, 30 Mar 2021 08:05:40 -0400 Subject: [PATCH 1/5] 9.1 GA Signed-off-by: Kaleb S KEITHLEY --- glusterfs.spec | 24 +++++++++++++++++++++--- sources | 2 +- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index f576a40..3da4ab0 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -54,6 +54,16 @@ # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --with ipv6default %{?_with_ipv6default:%global _with_ipv6default --with-ipv6-default} +# linux-io_uring +# If you wish to compile an rpm without linux-io_uring support... +# rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --disable-linux-io_uring +%{?_without_linux_io_uring:%global _without_linux_io_uring --disable-linux-io_uring} + +# Disable linux-io_uring on unsupported distros. +%if ( 0%{?fedora} && 0%{?fedora} <= 32 ) || ( 0%{?rhel} && 0%{?rhel} <= 7 ) +%global _without_linux_io_uring --disable-linux-io_uring +%endif + # libtirpc # if you wish to compile an rpm without TIRPC (i.e. use legacy glibc rpc) # rpmbuild -ta @PACKAGE_NAME@-@PACKAGE_VERSION@.tar.gz --without libtirpc @@ -181,8 +191,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 9.0 -Release: 4%{?prereltag:%{prereltag}}%{?dist} +Version: 9.1 +Release: 1%{?prereltag:%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -219,7 +229,7 @@ BuildRequires: bison flex BuildRequires: gcc make libtool BuildRequires: ncurses-devel readline-devel BuildRequires: libxml2-devel openssl-devel -BuildRequires: libaio-devel libacl-devel liburing-devel +BuildRequires: libaio-devel libacl-devel BuildRequires: python%{_pythonver}-devel %if ( 0%{?rhel} && 0%{?rhel} < 8 ) BuildRequires: python-ctypes @@ -246,6 +256,10 @@ BuildRequires: libattr-devel BuildRequires: firewalld %endif +%if ( 0%{!?_without_linux_io_uring:1} ) +BuildRequires: liburing-devel +%endif + Obsoletes: hekafs <= %{version}-%{release} Obsoletes: %{name}-common < %{version}-%{release} Obsoletes: %{name}-core < %{version}-%{release} @@ -814,6 +828,7 @@ sed -i -e 's/--quiet//' configure.ac %{?_without_server} \ %{?_without_syslog} \ %{?_with_ipv6default} \ + %{?_without_linux_io_uring} \ %{?_without_libtirpc} # fix hardening and remove rpath in shlibs @@ -1591,6 +1606,9 @@ exit 0 %{_unitdir}/gluster-ta-volume.service %changelog +* Tue Mar 30 2021 Kaleb S. KEITHLEY - 9.1-1 +- 9.1 GA + * Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek - 9.0-4 - Rebuilt for updated systemd-rpm-macros See https://pagure.io/fesco/issue/2583. diff --git a/sources b/sources index ed57c7c..ba65d98 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-9.0.tar.gz) = daa5a7342c067c75668910e8fed17145636e7a576830b4cd68e81d9fceedaab918228b8780ebd5014e2397e0606858af650cd2c52bec0883ccd2126955ad07e7 +SHA512 (glusterfs-9.1.tar.gz) = 2c26813f12fed7a0640cc470badc2b83f156b660ef475487a689dca6c3fa407192f4959aeaf7a981969a079cf5d2c7aace85ff818ea6133d5a085d90d226e1da From a1bbd0699885b3b9fde9b0f2ca0f7720ca127830 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 29 Jun 2021 08:33:31 -0400 Subject: [PATCH 2/5] 9.3 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 356fbf2..1c22b7e 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1609,9 +1609,6 @@ exit 0 * Tue Jun 29 2021 Kaleb S. KEITHLEY - 9.3-1 - 9.3 GA -* Tue Jun 22 2021 Kaleb S. KEITHLEY - 9.2-5 -- Rebuilt for userspace-rcu-0.13 again - * Fri Jun 11 2021 Kaleb S. KEITHLEY - 9.2-4 - https://src.fedoraproject.org/rpms/glusterfs/pull-request/7 From 1249b4a758a0ee745cb76039e2a3079286634a2c Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 4 Oct 2021 08:31:33 -0400 Subject: [PATCH 3/5] 9.4 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 55751fc..19492d2 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1609,9 +1609,6 @@ exit 0 * Mon Oct 4 2021 Kaleb S. KEITHLEY - 9.4-1 - 9.4 GA -* Tue Sep 14 2021 Sahana Prasad - 9.3-3 -- Rebuilt with OpenSSL 3.0.0 - * Thu Jul 22 2021 Fedora Release Engineering - 9.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From aa5c16aea054a8bbe19fd1b075cf26e817f65272 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 4 Oct 2021 09:08:46 -0400 Subject: [PATCH 4/5] 9.4 GA Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 3b6dced..268273e 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1609,9 +1609,6 @@ exit 0 * Mon Oct 4 2021 Kaleb S. KEITHLEY - 9.4-1 - 9.4 GA -* Thu Jul 22 2021 Fedora Release Engineering - 9.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - * Tue Jun 29 2021 Kaleb S. KEITHLEY - 9.3-1 - 9.3 GA From f3c42df616fc3e8ef1a3263b3fdbbb6a766b59c5 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 17 Jan 2022 07:53:41 -0500 Subject: [PATCH 5/5] 9.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 19492d2..663bd9c 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -191,7 +191,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 9.4 +Version: 9.5 Release: 1%{?prereltag:%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ @@ -1606,6 +1606,9 @@ exit 0 %{_unitdir}/gluster-ta-volume.service %changelog +* Mon Jan 17 2022 Kaleb S. KEITHLEY - 9.5-1 +- 9.5 GA + * Mon Oct 4 2021 Kaleb S. KEITHLEY - 9.4-1 - 9.4 GA diff --git a/sources b/sources index 012c0b1..417e744 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-9.4.tar.gz) = 2a17197bd2b425117e34af004a6177b7c5012807cd99b9c6d37a1081e0ab9def6b013bedd0ba4122d149969755e0e2985bef8aed9cf612a27a6452b8719a33bf +SHA512 (glusterfs-9.5.tar.gz) = 3483068ba6d72a9c63cc6fcb2dbcb38dd5001564d755cc3a30dbf6402eeab9a7c80759a535be1c5c06eae88b61156a336444c89b12bbecdabf56a87f00328a44