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 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..ff2b36c 100644 --- a/libecpg-12.2-dependency-build.patch +++ b/libecpg-12.2-dependency-build.patch @@ -1,12 +1,11 @@ -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.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 - SHLIB_EXPORTS = exports.txt - --all: all-lib +-all: all-lib libpq-refs-stamp - # Shared library stuff include $(top_srcdir)/src/Makefile.shlib 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 b40f0e7..21f6b1d 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -1,9 +1,9 @@ -%global majorversion 13 +%global majorversion 16 Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.3 -Release: 1%{?dist} +Version: %majorversion.4 +Release: 3%{?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} @@ -53,6 +54,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 @@ -68,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 \ @@ -79,7 +82,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 @@ -130,7 +133,59 @@ find_lang_bins %name-devel.lst ecpg %changelog -* Thu Jun 17 2021 Filip Januš - 13.3-1 +* 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 + +* 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 + +* 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 + +* 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 + +* Tue Aug 22 2023 Ondrej Sloup - 15.4-1 +- Rebase to the latest upstream version +- 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 + +* 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 + +* 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 + +* Tue Jul 27 2021 Filip Januš - 13.3-1 - Update to 13.3 * Thu Jul 22 2021 Fedora Release Engineering - 13.1-6 diff --git a/sources b/sources index 4d746a3..04b03aa 100644 --- 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-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96 +SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674