From 43a5d449661e7127b278a2c179aadb95045b12ba Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 5 Dec 2023 20:04:36 +0100 Subject: [PATCH 01/13] Since macro postgresql_module_require is not working with demodularized version of postgresql package. It was changet to simple requirement --- postgresql-pgpool-II.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 6e0444c..f8a207a 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.4.4 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz @@ -69,7 +69,7 @@ Development headers and libraries for pgpool-II. Summary: Postgresql extensions for pgpool-II Obsoletes: postgresql-pgpool-II-recovery <= 3.3.4-1 Provides: postgresql-pgpool-II-recovery = %{version}-%{release} -Requires: postgresql-server(:MODULE_COMPAT_%{postgresql_major}) +Requires: postgresql-server Requires: %{name}%{?_isa} = %{version}-%{release} @@ -240,6 +240,10 @@ fi %changelog +* Tue Dec 05 2023 Filip Janus - 4.4.4-2 +- Rebuild for demodularized version of postgresql +- remove postgresq-_module_compat since it is not working with demodularized packages + * Tue Aug 22 2023 Ondrej Sloup - 4.4.4-1 - Rebase to the latest upstream version (rhbz#2232454) From bd28abd49322612a6eb6d728409be61b33f7a445 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 5 Dec 2023 20:16:17 +0100 Subject: [PATCH 02/13] Update to 4.4.5 --- .gitignore | 0 postgresql-pgpool-II.spec | 7 +++++-- sources | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 sources diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index f8a207a..a443fe0 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -9,8 +9,8 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 4.4.4 -Release: 2%{?dist} +Version: 4.4.5 +Release: 1%{?dist} License: BSD URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz @@ -240,6 +240,9 @@ fi %changelog +* Tue Dec 05 2023 Filip Janus - 4.4.5-1 +- Update to 4.4.5 + * Tue Dec 05 2023 Filip Janus - 4.4.4-2 - Rebuild for demodularized version of postgresql - remove postgresq-_module_compat since it is not working with demodularized packages diff --git a/sources b/sources old mode 100644 new mode 100755 index 58ce9e8..2d4c0e6 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pgpool-II-4.4.4.tar.gz) = fb80df3df2894e7f2cf820a2b32e04ef6447a8137341db65c3a141679ea0fcbae7d5824c1904cb19aae7b05ef9fe641ac294dbc58cdbc6231444f0c4e508e7dc +SHA512 (pgpool-II-4.4.5.tar.gz) = cd2fb2f715aed70d67522ab1852fa7df059d5379f9d4860be82a3d32d78701c5bce75e3e1304eda6a67670475aa367a2631cce517a4d2e4eb6b07c1e74901dd9 From 520d33fd259422424398c37ea0ae2154b4681070 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 22:11:58 +0000 Subject: [PATCH 03/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- postgresql-pgpool-II.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index a443fe0..b8afb82 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.4.5 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz @@ -240,6 +240,9 @@ fi %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 4.4.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Dec 05 2023 Filip Janus - 4.4.5-1 - Update to 4.4.5 From 7a05d0e6bd27f00b9186c96359ecb66e27beb424 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 23:59:03 +0000 Subject: [PATCH 04/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- postgresql-pgpool-II.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index b8afb82..12fd954 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.4.5 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz @@ -240,6 +240,9 @@ fi %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 4.4.5-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 4.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From afd89d592182dd385408b05ba70bdeec1802ce7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Fri, 26 Jan 2024 21:16:00 +0100 Subject: [PATCH 05/13] Rebase to the latest upstream version (rhbz#2252211) --- postgresql-pgpool-II.spec | 11 +++++++---- sources | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 12fd954..a6f211a 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -9,8 +9,8 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 4.4.5 -Release: 3%{?dist} +Version: 4.5.0 +Release: 1%{?dist} License: BSD URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz @@ -240,16 +240,19 @@ fi %changelog +* Fri Jan 26 2024 Ondrej Sloup - 4.5.0-1 +- Rebase to the latest upstream version (rhbz#2252211) + * Thu Jan 25 2024 Fedora Release Engineering - 4.4.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild * Sun Jan 21 2024 Fedora Release Engineering - 4.4.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Tue Dec 05 2023 Filip Janus - 4.4.5-1 +* Tue Dec 05 2023 Filip Janus - 4.4.5-1 - Update to 4.4.5 -* Tue Dec 05 2023 Filip Janus - 4.4.4-2 +* Tue Dec 05 2023 Filip Janus - 4.4.4-2 - Rebuild for demodularized version of postgresql - remove postgresq-_module_compat since it is not working with demodularized packages diff --git a/sources b/sources index 2d4c0e6..a617f3d 100755 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pgpool-II-4.4.5.tar.gz) = cd2fb2f715aed70d67522ab1852fa7df059d5379f9d4860be82a3d32d78701c5bce75e3e1304eda6a67670475aa367a2631cce517a4d2e4eb6b07c1e74901dd9 +SHA512 (pgpool-II-4.5.0.tar.gz) = e16bdf11fad206ab2218a55bf29ea397999db7dc8afea4732aca293d39c23aa372f9305c5d3cf4431d2a43cc65cb5f9853449579bf1811c7edcae34f703146e0 From b672c4265dc5cebdbf0fe79fa4ebd0d7e9c95791 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Fri, 26 Jan 2024 22:04:56 +0100 Subject: [PATCH 06/13] Temporarily stop building i686 --- postgresql-pgpool-II.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index a6f211a..12fa567 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,20 +10,28 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.0 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD + URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz Source1: pgpool.service Source2: pgpool.sysconfig Source3: pgpool.init + +# Temporarily stop building i686 architecture as the build fails +# This is a temporary workaround +ExcludeArch: i686 + BuildRequires: make BuildRequires: gcc BuildRequires: clang-devel llvm-devel BuildRequires: postgresql-server-devel BuildRequires: pam-devel, libmemcached-devel, openssl-devel + %if %{systemd_enabled} BuildRequires: systemd + # We require this to be present for %%{_prefix}/lib/tmpfiles.d Requires: systemd Requires(post): systemd-sysv @@ -240,6 +248,9 @@ fi %changelog +* Fri Jan 26 2024 Ondrej Sloup - 4.5.0-2 +- Temporarily stop building i686 + * Fri Jan 26 2024 Ondrej Sloup - 4.5.0-1 - Rebase to the latest upstream version (rhbz#2252211) From 9e3870fc38ea9a36a73fa111f8f816474429dd6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Tue, 30 Jan 2024 23:09:35 +0100 Subject: [PATCH 07/13] Stop building i686 permanently --- postgresql-pgpool-II.spec | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 12fa567..a62130e 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.0 -Release: 2%{?dist} +Release: 3%{?dist} License: BSD URL: http://pgpool.net @@ -19,15 +19,14 @@ Source1: pgpool.service Source2: pgpool.sysconfig Source3: pgpool.init -# Temporarily stop building i686 architecture as the build fails -# This is a temporary workaround -ExcludeArch: i686 +# Stop building i686 architecture +ExcludeArch: %{ix86} BuildRequires: make BuildRequires: gcc BuildRequires: clang-devel llvm-devel BuildRequires: postgresql-server-devel -BuildRequires: pam-devel, libmemcached-devel, openssl-devel +BuildRequires: pam-devel, libmemcached-awesome-devel, openssl-devel %if %{systemd_enabled} BuildRequires: systemd @@ -70,6 +69,9 @@ DB nodes to be connected, which was not possible in pgpool-I. Summary: The development files for pgpool-II Requires: %{name}%{?_isa} = %{version}-%{release} +# Stop building i686 architecture +ExcludeArch: %{ix86} + %description devel Development headers and libraries for pgpool-II. @@ -80,6 +82,8 @@ Provides: postgresql-pgpool-II-recovery = %{version}-%{release} Requires: postgresql-server Requires: %{name}%{?_isa} = %{version}-%{release} +# Stop building i686 architecture +ExcludeArch: %{ix86} %description extensions Postgresql extensions libraries and sql files for pgpool-II. @@ -248,6 +252,10 @@ fi %changelog +* Tue Jan 30 2024 Ondrej Sloup - 4.5.0-3 +- Stop building i686 permanently +- https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval + * Fri Jan 26 2024 Ondrej Sloup - 4.5.0-2 - Temporarily stop building i686 From 9b773307035d19f4f7235ca2b1ad2ca04bd29a61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Thu, 29 Feb 2024 12:25:13 +0100 Subject: [PATCH 08/13] Rebase to the latest upstream version (rhbz#2266774) --- postgresql-pgpool-II.spec | 7 +++++-- sources | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index a62130e..7707715 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -9,8 +9,8 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} -Version: 4.5.0 -Release: 3%{?dist} +Version: 4.5.1 +Release: 1%{?dist} License: BSD URL: http://pgpool.net @@ -252,6 +252,9 @@ fi %changelog +* Thu Feb 29 2024 Ondrej Sloup - 4.5.1-1 +- Rebase to the latest upstream version (rhbz#2266774) + * Tue Jan 30 2024 Ondrej Sloup - 4.5.0-3 - Stop building i686 permanently - https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval diff --git a/sources b/sources index a617f3d..7af30b9 100755 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (pgpool-II-4.5.0.tar.gz) = e16bdf11fad206ab2218a55bf29ea397999db7dc8afea4732aca293d39c23aa372f9305c5d3cf4431d2a43cc65cb5f9853449579bf1811c7edcae34f703146e0 +SHA512 (pgpool-II-4.5.1.tar.gz) = 790278ca64303b924aeecfca6e78d934c6c8d48f1a705f3cf5d648ea79893f1749b10fd9d8575e5ae7f89997d0b311d0e5e7c02da771a0b37060bf12b4590d5f From af3d78f629fa0c4998a256cb106ee09d0178f38e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 19 Jul 2024 08:19:28 +0000 Subject: [PATCH 09/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- postgresql-pgpool-II.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 7707715..37470cc 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.1 -Release: 1%{?dist} +Release: 2%{?dist} License: BSD URL: http://pgpool.net @@ -252,6 +252,9 @@ fi %changelog +* Fri Jul 19 2024 Fedora Release Engineering - 4.5.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Thu Feb 29 2024 Ondrej Sloup - 4.5.1-1 - Rebase to the latest upstream version (rhbz#2266774) From da23c56d50e3b7f858a2a1ee40e9980bb9e1ba65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miroslav=20Such=C3=BD?= Date: Wed, 4 Sep 2024 19:15:43 +0200 Subject: [PATCH 10/13] convert license to SPDX This is part of https://fedoraproject.org/wiki/Changes/SPDX_Licenses_Phase_4 --- postgresql-pgpool-II.spec | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 37470cc..86c5606 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,8 +10,9 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.1 -Release: 2%{?dist} -License: BSD +Release: 3%{?dist} +# Automatically converted from old format: BSD - review is highly recommended. +License: LicenseRef-Callaway-BSD URL: http://pgpool.net Source0: http://www.pgpool.net/mediawiki/images/%{short_name}-%{version}.tar.gz @@ -252,6 +253,9 @@ fi %changelog +* Wed Sep 04 2024 Miroslav Suchý - 4.5.1-3 +- convert license to SPDX + * Fri Jul 19 2024 Fedora Release Engineering - 4.5.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From d38f17f0a65eb369b1a702c509ab97c4a51e1c97 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 18 Jan 2025 10:38:34 +0000 Subject: [PATCH 11/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- postgresql-pgpool-II.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 86c5606..2d5db59 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.1 -Release: 3%{?dist} +Release: 4%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -253,6 +253,9 @@ fi %changelog +* Sat Jan 18 2025 Fedora Release Engineering - 4.5.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Sep 04 2024 Miroslav Suchý - 4.5.1-3 - convert license to SPDX From 2cd42dbc6244c4f6a50a4dc9dee0a385ff0f257b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= Date: Sat, 1 Feb 2025 19:56:42 +0100 Subject: [PATCH 12/13] Add explicit BR: libxcrypt-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Björn Esser --- postgresql-pgpool-II.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 2d5db59..8df44b3 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.1 -Release: 4%{?dist} +Release: 5%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -28,6 +28,7 @@ BuildRequires: gcc BuildRequires: clang-devel llvm-devel BuildRequires: postgresql-server-devel BuildRequires: pam-devel, libmemcached-awesome-devel, openssl-devel +BuildRequires: libxcrypt-devel %if %{systemd_enabled} BuildRequires: systemd @@ -253,6 +254,9 @@ fi %changelog +* Sat Feb 01 2025 Björn Esser - 4.5.1-5 +- Add explicit BR: libxcrypt-devel + * Sat Jan 18 2025 Fedora Release Engineering - 4.5.1-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 092d9f262b3d2675d0f2fd4f0a642ad2942136e4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 06:04:12 +0000 Subject: [PATCH 13/13] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- postgresql-pgpool-II.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/postgresql-pgpool-II.spec b/postgresql-pgpool-II.spec index 8df44b3..e4142db 100644 --- a/postgresql-pgpool-II.spec +++ b/postgresql-pgpool-II.spec @@ -10,7 +10,7 @@ Summary: Pgpool is a connection pooling/replication server for PostgreSQL Name: postgresql-%{short_name} Version: 4.5.1 -Release: 5%{?dist} +Release: 6%{?dist} # Automatically converted from old format: BSD - review is highly recommended. License: LicenseRef-Callaway-BSD @@ -254,6 +254,9 @@ fi %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 4.5.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Sat Feb 01 2025 Björn Esser - 4.5.1-5 - Add explicit BR: libxcrypt-devel