diff --git a/ci.fmf b/ci.fmf index 95aa67d..2eab7b6 100644 --- a/ci.fmf +++ b/ci.fmf @@ -1,8 +1,11 @@ summary: Tier tests discover: how: fmf - repository: https://src.fedoraproject.org/tests/postgresql.git - ref: main + # 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 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 8976a99..d1d64e0 100644 --- a/libecpg-10.5-no-compat-lib.patch +++ b/libecpg-10.5-no-compat-lib.patch @@ -1,10 +1,11 @@ Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build it now, at least till somebody explicitly requests that. -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 @@ +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 top_builddir = ../../.. include $(top_builddir)/src/Makefile.global @@ -12,4 +13,4 @@ diff -ur postgresql-14.2_original/src/interfaces/ecpg/Makefile postgresql-14.2/s +SUBDIRS = include pgtypeslib ecpglib preproc # Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf - # https://savannah.gnu.org/bugs/?30653 + # http://savannah.gnu.org/bugs/?30653 diff --git a/libecpg-12.2-dependency-build.patch b/libecpg-12.2-dependency-build.patch index ff2b36c..bdad581 100644 --- a/libecpg-12.2-dependency-build.patch +++ b/libecpg-12.2-dependency-build.patch @@ -1,11 +1,12 @@ -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 +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 --all: all-lib libpq-refs-stamp + SHLIB_EXPORTS = exports.txt + +-all: all-lib - # 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 04ffb2a..668c771 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 want clients to pull symbols from the non-shared libraries libpgport + # We force 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 21f6b1d..8230a15 100644 --- a/libecpg.spec +++ b/libecpg.spec @@ -1,9 +1,9 @@ -%global majorversion 16 +%global majorversion 13 Summary: ECPG - Embedded SQL in C Name: libecpg -Version: %majorversion.4 -Release: 3%{?dist} +Version: %majorversion.1 +Release: 5%{?dist} License: PostgreSQL Url: http://www.postgresql.org/ @@ -29,7 +29,6 @@ BuildRequires: libpq-devel BuildRequires: gettext BuildRequires: multilib-rpm-config BuildRequires: make -BuildRequires: libicu-devel Requires: libpgtypes = %{version}-%{release} @@ -54,7 +53,6 @@ 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 @@ -70,7 +68,6 @@ 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 \ @@ -82,7 +79,7 @@ export CFLAGS="$CFLAGS -std=c17" --without-readline \ --datadir=%_datadir/pgsql -%make_build -C "src/interfaces/ecpg" -j1 +%make_build -C "src/interfaces/ecpg" %install @@ -133,64 +130,6 @@ 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 - -* 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 -- 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 diff --git a/sources b/sources index 04b03aa..9c16b33 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96 -SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674 +SHA512 (postgresql-13.1.tar.bz2) = b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca +SHA512 (postgresql-13.1.tar.bz2.sha256) = 58f2ad590b5946bdb3f8bc512318c60a48916ebac7df854b6b737daa609b4fd78c71fe9bf04a4103885527ed498bb46bf68ce8e656b357f9ae43b556bd48df41