Compare commits
28 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9440861ccb | ||
|
|
e0ed6a0c41 | ||
|
|
c9ff9fe252 | ||
|
|
2f6e14c44c | ||
|
|
e60685a0df | ||
|
|
f2d6216975 | ||
|
|
65adc8c6d7 | ||
|
|
2d0e515141 | ||
|
|
4b1075ab35 | ||
|
|
ce6d1f768e | ||
|
|
1328413b81 | ||
|
|
4e48d1dafd | ||
|
|
6c4b5dac4f | ||
|
|
d8d5b37b1e | ||
|
|
fb0ee4da57 | ||
|
|
7727291730 | ||
|
|
24c79b0e41 | ||
|
|
d292a61671 | ||
|
|
bc73b29bfb | ||
|
|
0acdf142d1 | ||
|
|
9ca5d6fc26 | ||
|
|
5b845be81f | ||
|
|
bdc4249e7a | ||
|
|
2fbd21fcc9 | ||
|
|
6aa957dd62 | ||
|
|
75bd7c6928 | ||
|
|
c84948958d | ||
|
|
61fbc83045 |
6 changed files with 82 additions and 26 deletions
7
ci.fmf
7
ci.fmf
|
|
@ -1,11 +1,8 @@
|
||||||
summary: Tier tests
|
summary: Tier tests
|
||||||
discover:
|
discover:
|
||||||
how: fmf
|
how: fmf
|
||||||
# using temporary location before the test is merged
|
repository: https://src.fedoraproject.org/tests/postgresql.git
|
||||||
#repository: git://pkgs.devel.redhat.com/tests/micropipenv
|
ref: main
|
||||||
#ref: master
|
|
||||||
repository: https://src.fedoraproject.org/forks/hhorak/tests/postgresql.git
|
|
||||||
ref: add-libecpg
|
|
||||||
filter: 'tag:libecpg'
|
filter: 'tag:libecpg'
|
||||||
execute:
|
execute:
|
||||||
how: tmt
|
how: tmt
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,10 @@
|
||||||
Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build
|
Nothing ever depended on libecpg_compat.so.3 in Fedora, so don't build
|
||||||
it now, at least till somebody explicitly requests that.
|
it now, at least till somebody explicitly requests that.
|
||||||
|
|
||||||
diff --git a/src/interfaces/ecpg/Makefile b/src/interfaces/ecpg/Makefile
|
diff -ur postgresql-14.2_original/src/interfaces/ecpg/Makefile postgresql-14.2/src/interfaces/ecpg/Makefile
|
||||||
index 41460a1..cc3dd37 100644
|
--- postgresql-14.2_original/src/interfaces/ecpg/Makefile 2022-02-23 09:31:24.000000000 +0100
|
||||||
--- a/src/interfaces/ecpg/Makefile
|
+++ postgresql-14.2/src/interfaces/ecpg/Makefile 2022-02-23 10:30:19.000000000 +0100
|
||||||
+++ b/src/interfaces/ecpg/Makefile
|
@@ -2,7 +2,7 @@
|
||||||
@@ -2,7 +2,7 @@ subdir = src/interfaces/ecpg
|
|
||||||
top_builddir = ../../..
|
top_builddir = ../../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
|
||||||
|
|
@ -13,4 +12,4 @@ index 41460a1..cc3dd37 100644
|
||||||
+SUBDIRS = include pgtypeslib ecpglib preproc
|
+SUBDIRS = include pgtypeslib ecpglib preproc
|
||||||
|
|
||||||
# Suppress parallel build of subdirectories to avoid a bug in GNU make 3.82, cf
|
# 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
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,11 @@
|
||||||
diff --git a/src/interfaces/libpq/Makefile b/src/interfaces/libpq/Makefile
|
diff -ur postgresql-14.4_original/src/interfaces/libpq/Makefile postgresql-14.4/src/interfaces/libpq/Makefile
|
||||||
index 32a9fdfb7b..899de131da 100644
|
--- postgresql-14.4_original/src/interfaces/libpq/Makefile 2022-06-22 12:24:56.506658251 +0200
|
||||||
--- a/src/interfaces/libpq/Makefile
|
+++ postgresql-14.4/src/interfaces/libpq/Makefile 2022-06-22 12:25:46.222779323 +0200
|
||||||
+++ b/src/interfaces/libpq/Makefile
|
@@ -98,8 +98,6 @@
|
||||||
@@ -76,8 +76,6 @@ SHLIB_PREREQS = submake-libpgport
|
PKG_CONFIG_REQUIRES_PRIVATE = libssl, libcrypto
|
||||||
|
endif
|
||||||
|
|
||||||
SHLIB_EXPORTS = exports.txt
|
-all: all-lib libpq-refs-stamp
|
||||||
|
|
||||||
-all: all-lib
|
|
||||||
-
|
-
|
||||||
# Shared library stuff
|
# Shared library stuff
|
||||||
include $(top_srcdir)/src/Makefile.shlib
|
include $(top_srcdir)/src/Makefile.shlib
|
||||||
|
|
|
||||||
|
|
@ -24,7 +24,7 @@ diff -ur postgresql-12.2/src/Makefile.global.in postgresql-12.2_patch/src/Makefi
|
||||||
+libpq = -lpq
|
+libpq = -lpq
|
||||||
|
|
||||||
# libpq_pgport is for use by client executables (not libraries) that use libpq.
|
# 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 @@
|
@@ -580,7 +580,6 @@
|
||||||
# Commonly used submake targets
|
# Commonly used submake targets
|
||||||
|
|
||||||
|
|
|
||||||
69
libecpg.spec
69
libecpg.spec
|
|
@ -1,9 +1,9 @@
|
||||||
%global majorversion 13
|
%global majorversion 16
|
||||||
|
|
||||||
Summary: ECPG - Embedded SQL in C
|
Summary: ECPG - Embedded SQL in C
|
||||||
Name: libecpg
|
Name: libecpg
|
||||||
Version: %majorversion.1
|
Version: %majorversion.4
|
||||||
Release: 5%{?dist}
|
Release: 3%{?dist}
|
||||||
|
|
||||||
License: PostgreSQL
|
License: PostgreSQL
|
||||||
Url: http://www.postgresql.org/
|
Url: http://www.postgresql.org/
|
||||||
|
|
@ -29,6 +29,7 @@ BuildRequires: libpq-devel
|
||||||
BuildRequires: gettext
|
BuildRequires: gettext
|
||||||
BuildRequires: multilib-rpm-config
|
BuildRequires: multilib-rpm-config
|
||||||
BuildRequires: make
|
BuildRequires: make
|
||||||
|
BuildRequires: libicu-devel
|
||||||
|
|
||||||
Requires: libpgtypes = %{version}-%{release}
|
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
|
%package -n libpgtypes
|
||||||
Summary: Map PostgreSQL database types to C equivalents
|
Summary: Map PostgreSQL database types to C equivalents
|
||||||
|
|
||||||
|
|
||||||
%description -n libpgtypes
|
%description -n libpgtypes
|
||||||
The pgtypes library maps PostgreSQL database types to C equivalents that can be
|
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
|
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
|
%build
|
||||||
|
export CFLAGS="$CFLAGS -std=c17"
|
||||||
# We don't build server nor client (e.g. /bin/psql) binaries in this package, so
|
# We don't build server nor client (e.g. /bin/psql) binaries in this package, so
|
||||||
# we can disable some configure options.
|
# we can disable some configure options.
|
||||||
%configure \
|
%configure \
|
||||||
|
|
@ -79,7 +82,7 @@ find . -type f -name .gitignore | xargs rm
|
||||||
--without-readline \
|
--without-readline \
|
||||||
--datadir=%_datadir/pgsql
|
--datadir=%_datadir/pgsql
|
||||||
|
|
||||||
%make_build -C "src/interfaces/ecpg"
|
%make_build -C "src/interfaces/ecpg" -j1
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
|
|
@ -130,6 +133,64 @@ find_lang_bins %name-devel.lst ecpg
|
||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Jul 24 2025 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-3
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
|
||||||
|
|
||||||
|
* Fri Jan 17 2025 Fedora Release Engineering <releng@fedoraproject.org> - 16.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Aug 29 2024 Ales Nezbeda <anezbeda@redhat.com> - 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 <releng@fedoraproject.org> - 16.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
|
||||||
|
|
||||||
|
* Mon May 27 2024 Ales Nezbeda <anezbeda@redhat.com> - 16.3-1
|
||||||
|
- Update to 16.3
|
||||||
|
|
||||||
|
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 16.1-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Yaakov Selkowitz <yselkowi@redhat.com> - 16.1-1
|
||||||
|
- Update to 16.1
|
||||||
|
|
||||||
|
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 15.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Aug 22 2023 Ondrej Sloup <osloup@redhat.com> - 15.4-1
|
||||||
|
- Rebase to the latest upstream version
|
||||||
|
- Update dependency patch file to match the rebase
|
||||||
|
|
||||||
|
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14.4-5
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 14.4-4
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
|
||||||
|
|
||||||
|
* Thu Sep 1 2022 Ondřej Sloup <osloup@redhat.com> - 14.4-3
|
||||||
|
- Raise the release number as dependencies change enabled a new build
|
||||||
|
|
||||||
|
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 14.4-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||||
|
|
||||||
|
* Wed Jun 22 2022 Ondřej Sloup <osloup@redhat.com> - 14.4-1
|
||||||
|
- Update to 14.4
|
||||||
|
- Update libecpg-12.2-dependency-build.patch file
|
||||||
|
|
||||||
|
* Tue Feb 22 2022 Filip Januš <fjanus@redhat.com> - 14.2-1
|
||||||
|
- Update to 14.2
|
||||||
|
|
||||||
|
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 13.3-2
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||||
|
|
||||||
|
* Tue Jul 27 2021 Filip Januš <fjanus@redhat.com> - 13.3-1
|
||||||
|
- Update to 13.3
|
||||||
|
|
||||||
|
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 13.1-6
|
||||||
|
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||||
|
|
||||||
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 13.1-5
|
* Mon Feb 08 2021 Pavel Raiskup <praiskup@redhat.com> - 13.1-5
|
||||||
- rebuild for libpq ABI fix rhbz#1908268
|
- rebuild for libpq ABI fix rhbz#1908268
|
||||||
|
|
||||||
|
|
|
||||||
4
sources
4
sources
|
|
@ -1,2 +1,2 @@
|
||||||
SHA512 (postgresql-13.1.tar.bz2) = b7bd378db1dcb74ebcd5fffba03b82d8117d182029e4caca48eef62d8bcdbeef2c2e10f18eef0cdafb9d7acf21aa164d040e56687709f97b08c51540a786eeca
|
SHA512 (postgresql-16.4.tar.bz2) = f2070299f0857a270317ac984f8393374cf00d4f32a082fe3c5481e36c560595ea711fed95e40d1bc90c5089edf8f165649d443d8b9c68614e1c83fc91268e96
|
||||||
SHA512 (postgresql-13.1.tar.bz2.sha256) = 58f2ad590b5946bdb3f8bc512318c60a48916ebac7df854b6b737daa609b4fd78c71fe9bf04a4103885527ed498bb46bf68ce8e656b357f9ae43b556bd48df41
|
SHA512 (postgresql-16.4.tar.bz2.sha256) = f5a33591b4a0810e2f90d21df471ba086acbd1f97099e38aed46e4d3b45ee72037ef5958c7f155dd9fb7969152599fb6946b792a12d92575bfbc595049b74674
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue