From 131c148851a746fe73ec49545904e8ab32b895a9 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Thu, 4 May 2023 10:20:54 -0400 Subject: [PATCH 1/3] glusterfs 11, cleanup ldconfig Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index 96b3246..daaf7a3 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -1,9 +1,7 @@ -%global _hardened_build 1 - %global _for_fedora_koji_builds 1 -# uncomment and add '%' to use the %%dev for pre-releases +# uncomment and add '%' to use the %%prereltag for pre-releases # %%global prereltag rc0 ##----------------------------------------------------------------------------- @@ -196,7 +194,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 11.0 -Release: 1%{?prereltag:%{prereltag}}%{?dist} +Release: 2%{?prereltag:%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -226,8 +224,6 @@ Requires: libglusterfs0%{?_isa} = %{version}-%{release} Requires: libgfrpc0%{?_isa} = %{version}-%{release} Requires: libgfxdr0%{?_isa} = %{version}-%{release} %{?systemd_requires} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %if 0%{?_with_asan:1} && !( 0%{?rhel} && 0%{?rhel} < 7 ) BuildRequires: libasan %endif @@ -516,8 +512,6 @@ This package provides the glusterfs legacy gNFS server xlator %package -n libglusterfs0 Summary: GlusterFS libglusterfs library -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig Requires: libgfrpc0%{?_isa} = %{version}-%{release} Requires: libgfxdr0%{?_isa} = %{version}-%{release} Obsoletes: %{name}-libs <= %{version}-%{release} @@ -755,8 +749,6 @@ Requires: %{name}-client-xlators = %{version}-%{release} Requires: psmisc Requires: lvm2 %{?systemd_requires} -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig %if (0%{?_with_firewalld:1}) # we install firewalld rules, so we need to have the directory owned %if ( 0%{!?rhel} ) @@ -809,7 +801,7 @@ This package provides the glusterfs thin-arbiter translator. %prep %setup -q -n %{name}-%{version}%{?prereltag} %ifarch x86_64 aarch64 -%patch0001 -p1 +%patch 0001 -p1 %endif %if ( ! %{_usepython3} ) echo "fixing python shebangs..." @@ -1031,9 +1023,6 @@ fi exit 0 %endif -# post and postun scriptlets for libs -%ldconfig_scriptlets libs - %if ( 0%{!?_without_server:1} ) %post server # Legacy server @@ -1077,7 +1066,7 @@ fi # BZ 834847 if [ -e /etc/ld.so.conf.d/glusterfs.conf ]; then rm -f /etc/ld.so.conf.d/glusterfs.conf - /sbin/ldconfig + /usr/sbin/ldconfig fi %if (0%{?_with_firewalld:1}) @@ -1629,6 +1618,9 @@ exit 0 %{_unitdir}/gluster-ta-volume.service %changelog +* Thu May 4 2023 Kaleb S. KEITHLEY - 11.0-2 +- glusterfs 11, cleanup ldconfig + * Fri Feb 10 2023 Adam Williamson - 11.0-1 - Fix a mistake in the libglusterd0 obsolete From 876d0d7f0a0de6ed7edb1af15850b2ee89841406 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Tue, 22 Aug 2023 13:56:55 -0400 Subject: [PATCH 2/3] /usr/lib/ocf/resource.d -> resource-agents Signed-off-by: Kaleb S. KEITHLEY --- glusterfs.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/glusterfs.spec b/glusterfs.spec index daaf7a3..be9aeda 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -194,7 +194,7 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs Version: 11.0 -Release: 2%{?prereltag:%{prereltag}}%{?dist} +Release: 3%{?prereltag:%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -715,7 +715,7 @@ BuildArch: noarch # for glusterd Requires: %{name}-server = %{version}-%{release} # depending on the distribution, we need pacemaker or resource-agents -Requires: %{_prefix}/lib/ocf/resource.d +Requires: resource-agents %description resource-agents GlusterFS is a distributed file-system capable of scaling to several @@ -1618,6 +1618,9 @@ exit 0 %{_unitdir}/gluster-ta-volume.service %changelog +* Tue Aug 22 2023 Kaleb S. KEITHLEY - 11.0-3 +- /usr/lib/ocf/resource.d -> resource-agents + * Thu May 4 2023 Kaleb S. KEITHLEY - 11.0-2 - glusterfs 11, cleanup ldconfig From 3b3020c33025dff5a86828b08860800572604e75 Mon Sep 17 00:00:00 2001 From: "Kaleb S. KEITHLEY" Date: Mon, 6 Nov 2023 13:28:27 -0500 Subject: [PATCH 3/3] glusterfs 11.1 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 be9aeda..81f9ef0 100644 --- a/glusterfs.spec +++ b/glusterfs.spec @@ -193,8 +193,8 @@ Summary: Distributed File System %if ( 0%{_for_fedora_koji_builds} ) Name: glusterfs -Version: 11.0 -Release: 3%{?prereltag:%{prereltag}}%{?dist} +Version: 11.1 +Release: 1%{?prereltag:%{prereltag}}%{?dist} %else Name: @PACKAGE_NAME@ Version: @PACKAGE_VERSION@ @@ -1618,6 +1618,9 @@ exit 0 %{_unitdir}/gluster-ta-volume.service %changelog +* Mon Nov 6 2023 Kaleb S. KEITHLEY - 11.1-0 +- glusterfs 11.1 GA + * Tue Aug 22 2023 Kaleb S. KEITHLEY - 11.0-3 - /usr/lib/ocf/resource.d -> resource-agents diff --git a/sources b/sources index a683c39..4457fa4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (glusterfs-11.0.tar.gz) = 075f0025a1892ebb28d45d0a4e8971656319582dd7bc2c8b19ea26cd08a789bb54f8bc9752839706cd0ee0ca54be74245230bc453a5d1e9e163af84f08937e69 +SHA512 (glusterfs-11.1.tar.gz) = a021a612b01c2c43858b092db926e6d229f0f736c19b8a1015c0d3121fbc7739ab5273384d5e96fde6dbf4eaf620bc32a0530597e80483865d8ca79b820ed3b0