From 61fbc83045a16ac3461b887664a4b92cc51488ae Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 11:16:53 +0000 Subject: [PATCH 01/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index 8230a15..0d74972 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.1 -Release: 5%{?dist} +Release: 6%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Mon Feb 08 2021 Pavel Raiskup - 13.1-5 - rebuild for libpq ABI fix rhbz#1908268 From c84948958df49e627198320400acdda2da1fc853 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Tue, 27 Jul 2021 13:58:26 +0200 Subject: [PATCH 02/27] Update to 13.3 --- libecpg.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/libecpg.spec b/libecpg.spec index 0d74972..b40f0e7 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -2,8 +2,8 @@ Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.1 -Release: 6%{?dist} +Version: %majorversion.3 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jun 17 2021 Filip Januš - 13.3-1 +- Update to 13.3 + * Thu Jul 22 2021 Fedora Release Engineering - 13.1-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 75bd7c692885b5e1c9fa258acf1cd5c7fae61737 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Janu=C5=A1?= Date: Tue, 27 Jul 2021 14:50:42 +0200 Subject: [PATCH 03/27] Update to 13.3 --- sources | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources b/sources index 9c16b33..4d746a3 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.1.tar.bz2) = b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca -SHA512 (postgresql-13.1.tar.bz2.sha256) = 58f2ad590b5946bdb3f8bc512318c60a48916ebac7df854b6b737daa609b4fd78c71fe9bf04a4103885527ed498bb46bf68ce8e656b357f9ae43b556bd48df41 +SHA512 (postgresql-13.3.tar.bz2) = 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60 +SHA512 (postgresql-13.3.tar.bz2.sha256) = 5d0297a8e7596cf6305592de8a5c66f587b3d5bd9f4b4d1780357798381482e9653c42557fdde26f62eacf2f814c6d7c9ab8189faa39a5eb532384630fbcfe26 From 6aa957dd62266f85781b853dc6fc3c3df66f480b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 16:06:52 +0000 Subject: [PATCH 04/27] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index b40f0e7..66d9b22 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 13.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jun 17 2021 Filip Januš - 13.3-1 - Update to 13.3 From 2fbd21fcc91945454a716698b1627d72e595d5d3 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Tue, 22 Feb 2022 14:56:47 +0100 Subject: [PATCH 05/27] Update to 14.2 --- .gitignore | 0 libecpg.spec | 9 ++++++--- sources | 4 ++-- 3 files changed, 8 insertions(+), 5 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/libecpg.spec b/libecpg.spec index 66d9b22..d68398b 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -1,9 +1,9 @@ -%global majorversion 13 +%global majorversion 14 Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.3 -Release: 2%{?dist} +Version: %majorversion.2 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -130,6 +130,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Tue Feb 22 2022 Filip Januš - 14.2-1 +- Update to 14.2 + * Thu Jan 20 2022 Fedora Release Engineering - 13.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild diff --git a/sources b/sources old mode 100644 new mode 100755 index 4d746a3..3a0b56c --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-13.3.tar.bz2) = 1560cc766982a9ea9d33c77835b20e33e11b03acb77fc75d905c565883935a7dbcd27b9b2ab6a0ecdb815261f7c259865cb3dac85c10a3181c3fcaeb4d28bf60 -SHA512 (postgresql-13.3.tar.bz2.sha256) = 5d0297a8e7596cf6305592de8a5c66f587b3d5bd9f4b4d1780357798381482e9653c42557fdde26f62eacf2f814c6d7c9ab8189faa39a5eb532384630fbcfe26 +SHA512 (postgresql-14.2.tar.bz2) = 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b +SHA512 (postgresql-14.2.tar.bz2.sha256) = 5f6ea852a9afafb5051ed2abf406d5119f6f0133d2bb275a7c14d2fe7380f9db438423ee185366a3afd8d11a27c33664f13e6fdc862b95cc3ae6ddd827d390f2 From bdc4249e7a37f0b42da60530a17ab50e6597528b Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 23 Feb 2022 09:27:33 +0100 Subject: [PATCH 06/27] Fix changelog date --- libecpg.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index d68398b..0e36bf0 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -136,7 +136,7 @@ find_lang_bins %name-devel.lst ecpg * Thu Jan 20 2022 Fedora Release Engineering - 13.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Thu Jun 17 2021 Filip Januš - 13.3-1 +* Thu Jul 27 2021 Filip Januš - 13.3-1 - Update to 13.3 * Thu Jul 22 2021 Fedora Release Engineering - 13.1-6 From 5b845be81fb610afb92aa17e8bc05b4e403e18e8 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Wed, 23 Feb 2022 10:42:44 +0100 Subject: [PATCH 07/27] Fix offsets in patches --- libecpg-10.5-no-compat-lib.patch | 11 +++++------ libecpg-12.2-dependency-build.patch | 11 +++++------ libecpg.spec | 2 +- 3 files changed, 11 insertions(+), 13 deletions(-) diff --git a/libecpg-10.5-no-compat-lib.patch b/libecpg-10.5-no-compat-lib.patch index d1d64e0..8976a99 100644 --- a/libecpg-10.5-no-compat-lib.patch +++ b/libecpg-10.5-no-compat-lib.patch @@ -1,11 +1,10 @@ Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build it now, at least till somebody explicitly requests that. -diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile -index 41460a1..cc3dd37 100644 ---- a/src/interfaces/ecpg/Makefile -+++ b/src/interfaces/ecpg/Makefile -@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg +diff -ur postgresql-14.2_original/src/interfaces/ecpg/Makefile postgresql-14.2/src/interfaces/ecpg/Makefile +--- postgresql-14.2_original/src/interfaces/ecpg/Makefile 2022-02-23 09:31:24.000000000 +0100 ++++ postgresql-14.2/src/interfaces/ecpg/Makefile 2022-02-23 10:30:19.000000000 +0100 +@@ -2,7 +2,7 @@ top_builddir = ../../.. include $(top_builddir)/src/Makefile.global @@ -13,4 +12,4 @@ index 41460a1..cc3dd37 100644 +SUBDIRS = include pgtypeslib ecpglib preproc # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf - # http://savannah.gnu.org/bugs/?30653 + # https://savannah.gnu.org/bugs/?30653 diff --git a/libecpg-12.2-dependency-build.patch b/libecpg-12.2-dependency-build.patch index bdad581..5facb80 100644 --- a/libecpg-12.2-dependency-build.patch +++ b/libecpg-12.2-dependency-build.patch @@ -1,10 +1,9 @@ -diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile -index 32a9fdfb7b..899de131da 100644 ---- a/src/interfaces/libpq/Makefile -+++ b/src/interfaces/libpq/Makefile -@@ -76,8 +76,6 @@ SHLIB_PREREQS = submake-libpgport +diff -ur postgresql-14.2_original/src/interfaces/libpq/Makefile postgresql-14.2/src/interfaces/libpq/Makefile +--- postgresql-14.2_original/src/interfaces/libpq/Makefile 2022-02-23 09:31:25.000000000 +0100 ++++ postgresql-14.2/src/interfaces/libpq/Makefile 2022-02-23 10:18:14.000000000 +0100 +@@ -96,8 +96,6 @@ - SHLIB_EXPORTS = exports.txt + PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto -all: all-lib - diff --git a/libecpg.spec b/libecpg.spec index 0e36bf0..1dd19d2 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -136,7 +136,7 @@ find_lang_bins %name-devel.lst ecpg * Thu Jan 20 2022 Fedora Release Engineering - 13.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild -* Thu Jul 27 2021 Filip Januš - 13.3-1 +* Tue Jul 27 2021 Filip Januš - 13.3-1 - Update to 13.3 * Thu Jul 22 2021 Fedora Release Engineering - 13.1-6 From 9ca5d6fc26ede448c27e3715318e7254de2a0060 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Fri, 18 Mar 2022 10:10:58 +0100 Subject: [PATCH 08/27] Replace source of tests to upstream repo instead of fork --- ci.fmf | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/ci.fmf b/ci.fmf index 2eab7b6..95aa67d 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1,11 +1,8 @@ summary: Tier tests discover: how: fmf - # using temporary location before the test is merged - #repository: git://pkgs.devel.redhat.com/tests/micropipenv - #ref: master - repository: https://src.fedoraproject.org/forks/hhorak/tests/postgresql.git - ref: add-libecpg + repository: https://src.fedoraproject.org/tests/postgresql.git + ref: main filter: 'tag:libecpg' execute: how: tmt From 0acdf142d1f7e6e3590a4871eca5eb0436cb74ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Thu, 23 Jun 2022 10:37:02 +0200 Subject: [PATCH 09/27] Rebase to 14.4 --- libecpg-12.2-dependency-build.patch | 10 +++++----- libecpg.spec | 6 +++++- sources | 4 ++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/libecpg-12.2-dependency-build.patch b/libecpg-12.2-dependency-build.patch index 5facb80..8895434 100644 --- a/libecpg-12.2-dependency-build.patch +++ b/libecpg-12.2-dependency-build.patch @@ -1,9 +1,9 @@ -diff -ur postgresql-14.2_original/src/interfaces/libpq/Makefile postgresql-14.2/src/interfaces/libpq/Makefile ---- postgresql-14.2_original/src/interfaces/libpq/Makefile 2022-02-23 09:31:25.000000000 +0100 -+++ postgresql-14.2/src/interfaces/libpq/Makefile 2022-02-23 10:18:14.000000000 +0100 -@@ -96,8 +96,6 @@ - +diff -ur postgresql-14.4_original/src/interfaces/libpq/Makefile postgresql-14.4/src/interfaces/libpq/Makefile +--- postgresql-14.4_original/src/interfaces/libpq/Makefile 2022-06-22 12:24:56.506658251 +0200 ++++ postgresql-14.4/src/interfaces/libpq/Makefile 2022-06-22 12:25:46.222779323 +0200 +@@ -98,8 +98,6 @@ PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto + endif -all: all-lib - diff --git a/libecpg.spec b/libecpg.spec index 1dd19d2..900918b 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -2,7 +2,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.2 +Version: %majorversion.4 Release: 1%{?dist} License: PostgreSQL @@ -130,6 +130,10 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Wed Jun 22 2022 Ondřej Sloup - 14.4-1 +- Update to 14.4 +- Update libecpg-12.2-dependency-build.patch file + * Tue Feb 22 2022 Filip Januš - 14.2-1 - Update to 14.2 diff --git a/sources b/sources index 3a0b56c..bee8165 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-14.2.tar.bz2) = 19aeb6528605dbcf5df84048b2eed8f54b202576134d3fe3900bb8f073179c4258d2581acd745887e7e6fa86ebdb5f7b159ffaa0a645d601efee7c5f7730456b -SHA512 (postgresql-14.2.tar.bz2.sha256) = 5f6ea852a9afafb5051ed2abf406d5119f6f0133d2bb275a7c14d2fe7380f9db438423ee185366a3afd8d11a27c33664f13e6fdc862b95cc3ae6ddd827d390f2 +SHA512 (postgresql-14.4.tar.bz2) = dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb +SHA512 (postgresql-14.4.tar.bz2.sha256) = f2f4e5dd260163099742fe8a0ee854d92af425ba52243e699df006ea7c98153961a0ec08f684f3bbdbcc731cafe81621d36a9aad6594c702b54c03e9bb74a7d0 From bc73b29bfbeac832079f6abd4457e7838abcbecf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Thu, 23 Jun 2022 12:05:50 +0200 Subject: [PATCH 10/27] Format the spec --- libecpg.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libecpg.spec b/libecpg.spec index 900918b..1849554 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -53,6 +53,7 @@ package or any clients that use the ECPG to connect to a PostgreSQL server. %package -n libpgtypes Summary: Map PostgreSQL database types to C equivalents + %description -n libpgtypes The pgtypes library maps PostgreSQL database types to C equivalents that can be used in C programs. It also offers functions to do basic calculations with those From d292a61671a3c054eca85fb375bd9bb2efd37361 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 17:41:30 +0000 Subject: [PATCH 11/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index 1849554..6651e86 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 14.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jun 22 2022 Ondřej Sloup - 14.4-1 - Update to 14.4 - Update libecpg-12.2-dependency-build.patch file From 24c79b0e4186325d101e80af8b2480ce7d1c41e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Thu, 1 Sep 2022 17:59:18 +0200 Subject: [PATCH 12/27] Raise the release number as dependencies change enabled a new build --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index 6651e86..596a81e 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Sep 1 2022 Ondřej Sloup - 14.4-3 +- Raise the release number as dependencies change enabled a new build + * Thu Jul 21 2022 Fedora Release Engineering - 14.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 77272917301990760b4d9bc7e8437ffb3b3e6b5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 16:13:23 +0000 Subject: [PATCH 13/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index 596a81e..e10548d 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 3%{?dist} +Release: 4%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 14.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Sep 1 2022 Ondřej Sloup - 14.4-3 - Raise the release number as dependencies change enabled a new build From fb0ee4da579fac069a11f54cea5685868ae40ab9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 10:44:50 +0000 Subject: [PATCH 14/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index e10548d..5cee570 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 4%{?dist} +Release: 5%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 14.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Thu Jan 19 2023 Fedora Release Engineering - 14.4-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From d8d5b37b1e2c2a52f930a8c31c62edd3fb1ac3d9 Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Mon, 21 Aug 2023 11:54:32 +0200 Subject: [PATCH 15/27] migrated to SPDX license From 6c4b5dac4f3420a180cc7fd211484ad2b86b2579 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Tue, 22 Aug 2023 02:36:54 +0200 Subject: [PATCH 16/27] Rebase to the latest upstream version Updated dependency patch file to match the rebase --- libecpg-12.2-dependency-build.patch | 2 +- libecpg.spec | 12 +++++------- sources | 4 ++-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/libecpg-12.2-dependency-build.patch b/libecpg-12.2-dependency-build.patch index 8895434..b1fd2af 100644 --- a/libecpg-12.2-dependency-build.patch +++ b/libecpg-12.2-dependency-build.patch @@ -5,7 +5,7 @@ diff -ur postgresql-14.4_original/src/interfaces/libpq/Makefile postgresql-14.4/ PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto endif --all: all-lib +-all: all-lib libpq-refs-stamp - # Shared library stuff include $(top_srcdir)/src/Makefile.shlib diff --git a/libecpg.spec b/libecpg.spec index 5cee570..2a43c64 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -1,9 +1,9 @@ -%global majorversion 14 +%global majorversion 15 Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 5%{?dist} +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,11 +131,9 @@ find_lang_bins %name-devel.lst ecpg %changelog -* Thu Jul 20 2023 Fedora Release Engineering - 14.4-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Thu Jan 19 2023 Fedora Release Engineering - 14.4-4 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild +* Fri Jun 02 2023 Ondrej Sloup - 15.4-1 +- Rebase to the latest upstream version +- Updated dependency patch file to match the rebase * Thu Sep 1 2022 Ondřej Sloup - 14.4-3 - Raise the release number as dependencies change enabled a new build diff --git a/sources b/sources index bee8165..3ec1e02 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-14.4.tar.bz2) = dd2f80248684e331d2ffb1e26cd2a285df1fb18710807a0c31aedabf917912ce9267f8ca26318e5371d916c6fe476f8a17886d82d3ff86a974e6f24c19a6aafb -SHA512 (postgresql-14.4.tar.bz2.sha256) = f2f4e5dd260163099742fe8a0ee854d92af425ba52243e699df006ea7c98153961a0ec08f684f3bbdbcc731cafe81621d36a9aad6594c702b54c03e9bb74a7d0 +SHA512 (postgresql-15.4.tar.bz2) = 37dd3e8b644d10c4f55963e07344ff4b0079adbae60052306f230f15e4ef4662b89e84a63dacc87cbf926c80b186d064a391283dd16e29ab47f7acc8a9860d0b +SHA512 (postgresql-15.4.tar.bz2.sha256) = 9b0a915c5c387deabd5816052f5229a52c18b22b4ad3105e46f84f1789c13e89f8e9b2dbe54a536d06cf64eb8fc9b435eba90e3ed173ca8fed2ce0f4bc109b8a From 4e48d1dafd8bce8c52d71bf19f7ea1252b692b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ond=C5=99ej=20Sloup?= Date: Tue, 22 Aug 2023 03:10:47 +0200 Subject: [PATCH 17/27] Fix the log hierarchy --- libecpg.spec | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/libecpg.spec b/libecpg.spec index 2a43c64..ee9df70 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -131,9 +131,15 @@ find_lang_bins %name-devel.lst ecpg %changelog -* Fri Jun 02 2023 Ondrej Sloup - 15.4-1 +* Tue Aug 22 2023 Ondrej Sloup - 15.4-1 - Rebase to the latest upstream version -- Updated dependency patch file to match the rebase +- Update dependency patch file to match the rebase + +* Thu Jul 20 2023 Fedora Release Engineering - 14.4-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 14.4-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild * Thu Sep 1 2022 Ondřej Sloup - 14.4-3 - Raise the release number as dependencies change enabled a new build From 1328413b81d979db1ed6f53cf2ced72c46483bd9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 03:58:34 +0000 Subject: [PATCH 18/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index ee9df70..aee7138 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -131,6 +131,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 15.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Aug 22 2023 Ondrej Sloup - 15.4-1 - Rebase to the latest upstream version - Update dependency patch file to match the rebase From ce6d1f768ecda4f20995c2b9c5e255e919651183 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Sun, 21 Jan 2024 21:44:37 -0500 Subject: [PATCH 19/27] Update to 16.1 --- libecpg-12.2-dependency-build.patch | 2 +- libecpg-12.2-external-libpq.patch | 2 +- libecpg.spec | 10 +++++++--- sources | 4 ++-- 4 files changed, 11 insertions(+), 7 deletions(-) diff --git a/libecpg-12.2-dependency-build.patch b/libecpg-12.2-dependency-build.patch index b1fd2af..ff2b36c 100644 --- a/libecpg-12.2-dependency-build.patch +++ b/libecpg-12.2-dependency-build.patch @@ -2,7 +2,7 @@ diff -ur postgresql-14.4_original/src/interfaces/libpq/Makefile postgresql-14.4/ --- postgresql-14.4_original/src/interfaces/libpq/Makefile 2022-06-22 12:24:56.506658251 +0200 +++ postgresql-14.4/src/interfaces/libpq/Makefile 2022-06-22 12:25:46.222779323 +0200 @@ -98,8 +98,6 @@ - PKG_CONFIG_REQUIRES_PRIVATE = libssl libcrypto + PKG_CONFIG_REQUIRES_PRIVATE = libssl, libcrypto endif -all: all-lib libpq-refs-stamp diff --git a/libecpg-12.2-external-libpq.patch b/libecpg-12.2-external-libpq.patch index 668c771..04ffb2a 100644 --- a/libecpg-12.2-external-libpq.patch +++ b/libecpg-12.2-external-libpq.patch @@ -24,7 +24,7 @@ diff -ur postgresql-12.2/src/Makefile.global.in postgresql-12.2_patch/src/Makefi +libpq = -lpq # libpq_pgport is for use by client executables (not libraries) that use libpq. - # We force clients to pull symbols from the non-shared libraries libpgport + # We want clients to pull symbols from the non-shared libraries libpgport @@ -580,7 +580,6 @@ # Commonly used submake targets diff --git a/libecpg.spec b/libecpg.spec index aee7138..de6cf81 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -1,9 +1,9 @@ -%global majorversion 15 +%global majorversion 16 Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.4 -Release: 2%{?dist} +Version: %majorversion.1 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -29,6 +29,7 @@ BuildRequires: libpq-devel BuildRequires: gettext BuildRequires: multilib-rpm-config BuildRequires: make +BuildRequires: libicu-devel Requires: libpgtypes = %{version}-%{release} @@ -131,6 +132,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Sun Jan 21 2024 Yaakov Selkowitz - 16.1-1 +- Update to 16.1 + * Sun Jan 21 2024 Fedora Release Engineering - 15.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 3ec1e02..2bc1280 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-15.4.tar.bz2) = 37dd3e8b644d10c4f55963e07344ff4b0079adbae60052306f230f15e4ef4662b89e84a63dacc87cbf926c80b186d064a391283dd16e29ab47f7acc8a9860d0b -SHA512 (postgresql-15.4.tar.bz2.sha256) = 9b0a915c5c387deabd5816052f5229a52c18b22b4ad3105e46f84f1789c13e89f8e9b2dbe54a536d06cf64eb8fc9b435eba90e3ed173ca8fed2ce0f4bc109b8a +SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918 +SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1 From 4b1075ab3507329f72c15a6e9f16283d10b31e2b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 01:59:14 +0000 Subject: [PATCH 20/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index de6cf81..43dafd5 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.1 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -132,6 +132,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 16.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Yaakov Selkowitz - 16.1-1 - Update to 16.1 From 2d0e5151419a12944b416473cf6ad692ace8da1c Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Sat, 1 Jun 2024 19:57:37 +0200 Subject: [PATCH 21/27] Drop executable bit from sources and .gitignore files --- .gitignore | 0 sources | 0 2 files changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 .gitignore mode change 100755 => 100644 sources diff --git a/.gitignore b/.gitignore old mode 100755 new mode 100644 diff --git a/sources b/sources old mode 100755 new mode 100644 From 65adc8c6d7e114c0e9d6ba4ea2ea3c16d9e3f227 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Mon, 27 May 2024 15:01:41 +0200 Subject: [PATCH 22/27] Bump version to 16.3 --- libecpg.spec | 7 +++++-- sources | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/libecpg.spec b/libecpg.spec index 43dafd5..8b9cfdb 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -2,8 +2,8 @@ Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.1 -Release: 2%{?dist} +Version: %majorversion.3 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -132,6 +132,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Mon May 27 2024 Ales Nezbeda - 16.3-1 +- Update to 16.3 + * Thu Jan 25 2024 Fedora Release Engineering - 16.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild diff --git a/sources b/sources index 2bc1280..4f151c0 100755 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918 -SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1 +SHA512 (postgresql-16.3.tar.bz2) = dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f +SHA512 (postgresql-16.3.tar.bz2.sha256) = eeebced14bc6c42df864c00397caaafa91b3ddc1c3900943989f04d396674907f63051b93aeb6b1b2408ffeb1b2fc44521b123b42b986b45c19bdcf706523c84 From e60685a0df87e8872a35974bfea59f8b10b9f876 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 13:44:55 +0000 Subject: [PATCH 23/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index 8b9cfdb..c553f9d 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.3 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -132,6 +132,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 16.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon May 27 2024 Ales Nezbeda - 16.3-1 - Update to 16.3 From 2f6e14c44c364eaa27f5eadb7974402095fac9f4 Mon Sep 17 00:00:00 2001 From: Ales Nezbeda Date: Thu, 29 Aug 2024 13:08:07 +0200 Subject: [PATCH 24/27] Update to 16.4 Fix compilation sometimes failing due to race condition in makefile Resolves: BZ:2290330 --- libecpg.spec | 11 ++++++++--- sources | 4 ++-- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/libecpg.spec b/libecpg.spec index c553f9d..e703e6a 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -2,8 +2,8 @@ Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.3 -Release: 2%{?dist} +Version: %majorversion.4 +Release: 1%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -81,7 +81,7 @@ find . -type f -name .gitignore | xargs rm --without-readline \ --datadir=%_datadir/pgsql -%make_build -C "src/interfaces/ecpg" +%make_build -C "src/interfaces/ecpg" -j1 %install @@ -132,6 +132,11 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Aug 29 2024 Ales Nezbeda - 16.4-1 +- Update to 16.4 +- Fix compilation sometimes failing due to race condition in makefile +- Resolves: BZ:2290330 + * Thu Jul 18 2024 Fedora Release Engineering - 16.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild diff --git a/sources b/sources index 4f151c0..04b03aa 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-16.3.tar.bz2) = dc1c8d4fbc8e53e9be91dcf1b644b3969bd634f11bf5a1c4fe16619fd386f3349a5509788d43e6a57d099ad75233026d4dd4e0bb180ffc747fd3c1a575c51a5f -SHA512 (postgresql-16.3.tar.bz2.sha256) = eeebced14bc6c42df864c00397caaafa91b3ddc1c3900943989f04d396674907f63051b93aeb6b1b2408ffeb1b2fc44521b123b42b986b45c19bdcf706523c84 +SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96 +SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674 From c9ff9fe252c753bac2f2c03243ea43a5d40252bb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 11:05:36 +0000 Subject: [PATCH 25/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index e703e6a..46e7226 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 1%{?dist} +Release: 2%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -132,6 +132,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 16.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Aug 29 2024 Ales Nezbeda - 16.4-1 - Update to 16.4 - Fix compilation sometimes failing due to race condition in makefile From e0ed6a0c41de505a60161aa6f6c8377b092f74ea Mon Sep 17 00:00:00 2001 From: Filip Janus Date: Sun, 2 Feb 2025 15:39:23 +0000 Subject: [PATCH 26/27] gcc now uses std=gnu23 Use std=c17 to avoid errors --- libecpg.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/libecpg.spec b/libecpg.spec index 46e7226..a8ce9c7 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -70,6 +70,7 @@ find . -type f -name .gitignore | xargs rm %build +export CFLAGS="$CFLAGS -std=c17" # We don't build server nor client (e.g. /bin/psql) binaries in this package, so # we can disable some configure options. %configure \ From 9440861ccb78eab132ee69851795232a0575bcb0 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 19:35:26 +0000 Subject: [PATCH 27/27] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- libecpg.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/libecpg.spec b/libecpg.spec index a8ce9c7..21f6b1d 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -3,7 +3,7 @@ Summary: ECPG - Embedded SQL in C Name: libecpg Version: %majorversion.4 -Release: 2%{?dist} +Release: 3%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -133,6 +133,9 @@ find_lang_bins %name-devel.lst ecpg %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 16.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 16.4-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild