Compare commits

...

No commits in common. "c8" and "c10s" have entirely different histories.
c8 ... c10s

19 changed files with 226 additions and 41 deletions

1
.fmf/version Normal file
View File

@ -0,0 +1 @@
1

2
.gitignore vendored Normal file → Executable file
View File

@ -1 +1 @@
SOURCES/postgresql-13.5.tar.bz2
/postgresql-*.tar.bz2*

View File

@ -1 +0,0 @@
9321e2b01d1ffb15adae06945cb2c5f9dd671bc9 SOURCES/postgresql-13.5.tar.bz2

View File

@ -0,0 +1,41 @@
---
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: '{{ source_url }}/-/tree/{{ revision }}'
build.appstudio.redhat.com/commit_sha: '{{ revision }}'
build.appstudio.redhat.com/pull_request_number: '{{ pull_request_number }}'
build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "pull_request"
creationTimestamp: null
labels:
appstudio.openshift.io/application: rpms
appstudio.openshift.io/component: libecpg
pipelines.appstudio.openshift.io/type: build
name: libecpg-on-pull-request
namespace: rhel-on-konflux-tenant
spec:
params:
- name: package-name
value: libecpg
- name: git-url
value: "{{ source_url }}"
- name: revision
value: "{{ revision }}"
- name: target-branch
value: "{{ target_branch }}"
pipelineRef:
resolver: git
params:
- name: url
value: "https://gitlab.cee.redhat.com/rhel-on-konflux/rpmbuild-pipeline.git"
- name: revision
value: main
- name: pathInRepo
value: pipeline/build-rhel-package.yaml
workspaces:
- name: git-auth
secret:
secretName: '{{ git_auth_secret }}'

40
.tekton/libecpg-push.yaml Normal file
View File

@ -0,0 +1,40 @@
---
apiVersion: tekton.dev/v1
kind: PipelineRun
metadata:
annotations:
build.appstudio.openshift.io/repo: '{{ source_url }}/-/tree/{{ revision }}'
build.appstudio.redhat.com/commit_sha: '{{ revision }}'
build.appstudio.redhat.com/target_branch: '{{ target_branch }}'
pipelinesascode.tekton.dev/max-keep-runs: "3"
pipelinesascode.tekton.dev/on-cel-expression: event == "push"
creationTimestamp: null
labels:
appstudio.openshift.io/application: rpms
appstudio.openshift.io/component: libecpg
pipelines.appstudio.openshift.io/type: build
name: libecpg-on-push
namespace: rhel-on-konflux-tenant
spec:
params:
- name: package-name
value: libecpg
- name: git-url
value: "{{ source_url }}"
- name: revision
value: "{{ revision }}"
- name: target-branch
value: "{{ target_branch }}"
pipelineRef:
resolver: git
params:
- name: url
value: "https://gitlab.cee.redhat.com/rhel-on-konflux/rpmbuild-pipeline.git"
- name: revision
value: main
- name: pathInRepo
value: pipeline/build-rhel-package.yaml
workspaces:
- name: git-auth
secret:
secretName: '{{ git_auth_secret }}'

3
README.md Normal file
View File

@ -0,0 +1,3 @@
# libecpg
The libecpg package

View File

@ -1,13 +0,0 @@
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
SHLIB_EXPORTS = exports.txt
-all: all-lib
-
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
backend_src = $(top_srcdir)/src/backend

View File

@ -1 +0,0 @@
9b81067a55edbaabc418aacef457dd8477642827499560b00615a6ea6c13f6b3 postgresql-13.5.tar.bz2

8
ci.fmf Normal file
View File

@ -0,0 +1,8 @@
summary: Tier tests
discover:
how: fmf
repository: https://src.fedoraproject.org/tests/postgresql.git
ref: main
filter: 'tag:libecpg'
execute:
how: tmt

7
gating.yaml Normal file
View File

@ -0,0 +1,7 @@
#gating rhel
--- !Policy
product_versions:
- rhel-*
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: osci.brew-build./plans/tier1-internal.functional}

12
generate-sources.sh Executable file
View File

@ -0,0 +1,12 @@
#! /bin/sh
rm sources
set -e
spectool -S *.spec | cut -d' ' -f2 \
| grep -E -e 'postgresql-.*\.tar\.*' -e 'postgresql.*\.pdf' | sort | \
while read line
do
base=`basename "$line"`
echo " * handling $base"
sha512sum --tag "$base" >> sources
done

View File

@ -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

View File

@ -0,0 +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
-all: all-lib libpq-refs-stamp
-
# Shared library stuff
include $(top_srcdir)/src/Makefile.shlib
backend_src = $(top_srcdir)/src/backend

View File

@ -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

View File

@ -1,9 +1,9 @@
%global majorversion 13
%global majorversion 16
Summary: ECPG - Embedded SQL in C
Name: libecpg
Version: %majorversion.5
Release: 3%{?dist}
Version: %majorversion.1
Release: 13%{?dist}
License: PostgreSQL
Url: http://www.postgresql.org/
@ -28,6 +28,8 @@ BuildRequires: openldap-devel
BuildRequires: libpq-devel
BuildRequires: gettext
BuildRequires: multilib-rpm-config
BuildRequires: make
BuildRequires: libicu-devel
Requires: libpgtypes = %{version}-%{release}
@ -52,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
@ -78,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
@ -129,28 +132,90 @@ find_lang_bins %name-devel.lst ecpg
%changelog
* Thu Dec 09 2021 Filip Janus <fjanus@redhat.com> - 13.5-3
- Fix gating.yaml and rebuild
- switch to osci.brew-build.tier0.functional
* Fri Feb 07 2025 Michal Srb <michal@redhat.com> - 16.1-13
- Test draft builds with composes
* Mon Dec 6 2021 Marek Kulik <mkulik@redhat.com> - 13.5-2
- Rebuild for gating.
* Tue Jan 28 2025 Aviv Sabadra <asabadra@redhat.com> - 16.1-12
- Drop unnecessary PVC
* Wed Nov 24 2021 Marek Kulik <mkulik@redhat.com> - 13.5-1
- Update to 13.5 version
* Mon Jan 27 2025 Aviv Sabadra <asabadra@redhat.com> - 16.1-11
- Bump release for final January Konflux build
* Fri Feb 19 2021 Patrik Novotný <panovotn@redhat.com> - 13.2-1
- Rebase to upstream release 13.2
* Wed Nov 20 2024 Aviv Sabadra <asabadra@redhat.com> - 16.1-10
- Bump release for Konflux
* Mon Nov 18 2024 Aviv Sabadra <asabadra@redhat.com> - 16.1-8
- Bump release for building in Konflux
* Wed Nov 13 2024 Aviv Sabadra <asabadra@redhat.com> - 16.1-7
- Bump release for building in Konflux
* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 16.1-6
- Bump release for October 2024 mass rebuild:
Resolves: RHEL-64018
* Thu Aug 29 2024 Pavel Raiskup <praiskup@redhat.com> - 16.1-5
- make the build deterministic by serial make process
* Mon Aug 26 2024 Pavel Raiskup <praiskup@redhat.com> - 16.1-4
- rebuild in Konflux
* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 16.1-3
- Bump release for June 2024 mass rebuild
* 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
- rebuild for libpq ABI fix rhbz#1908268
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 13.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Thu Dec 03 2020 Honza Horak <hhorak@redhat.com> - 13.1-3
- Add Requires: libpgtypes to avoid the need to test interoperability
between the various combinations of old and new subpackages
* Wed Dec 02 2020 Honza Horak <hhorak@redhat.com> - 13.1-2
- Rebuild for CI tests fix
* Mon Nov 23 2020 Honza Horak <hhorak@redhat.com> - 13.1-1
- Update to 13.1 version
* Wed Nov 18 2020 Honza Horak <hhorak@redhat.com> - 13.1-1
- Rebase to upstream release 13.0
* Fri Oct 23 2020 Honza Horak <hhorak@redhat.com> - 13.0-1
- Rebase to upstream release 13.0

10
plans/tier1-internal.fmf Normal file
View File

@ -0,0 +1,10 @@
summary: internal tier 1 tests plan
discover:
how: fmf
filter: 'tier: 1'
url: https://pkgs.devel.redhat.com/git/tests/libecpg
execute:
how: tmt
adjust:
enabled: false
when: distro == centos-stream or distro == fedora

2
sources Executable file
View File

@ -0,0 +1,2 @@
SHA512 (postgresql-16.1.tar.bz2) = 69f4635e5841452599f13b47df41ce2425ab34b4e4582fd2c635bc78d561fa36c5b03eccb4ae6569872dc74775be1b5a62dee20c9a4f12a43339250128352918
SHA512 (postgresql-16.1.tar.bz2.sha256) = 3f573d81a7af02dea2a3eee180d4e465546fc4d283dde5b6627d25af0be4a546ffd3ae914dd3490e45264d1a43cf143e829e14e5cd9c6bd8f179b6eae4fd6ff1