diff --git a/root/ppg/staging/18/containers/percona-distribution-postgresql/obs/Dockerfile b/root/ppg/staging/18/containers/percona-distribution-postgresql/obs/Dockerfile index eec3414f..645ea343 100644 --- a/root/ppg/staging/18/containers/percona-distribution-postgresql/obs/Dockerfile +++ b/root/ppg/staging/18/containers/percona-distribution-postgresql/obs/Dockerfile @@ -4,7 +4,7 @@ #!BuildTag: percona-distribution-postgresql: #!BuildTag: percona-distribution-postgresql:%!{PG_VERSION} #!BuildTag: percona-distribution-postgresql:%!{PG_MAJOR_VERSION} - +#making this comment just to trigger this images build FROM percona-ubi-minimal:latest LABEL name="Percona Distribution for PostgreSQL" \ diff --git a/root/ppg/staging/18/percona-pg_tde/obs/_service b/root/ppg/staging/18/percona-pg_tde/obs/_service index 39e9c6fe..cc0bbfe6 100644 --- a/root/ppg/staging/18/percona-pg_tde/obs/_service +++ b/root/ppg/staging/18/percona-pg_tde/obs/_service @@ -1,10 +1,9 @@ - https://github.com/percona/pg_tde.git + https://github.com/dAdAbird/pg_tde.git git - release-%!{PG_TDE_VERSION} - @PARENT_TAG@ - release-(.*) + arch_logs + 2.2.2+1 enable percona-pg_tde%!{PG_MAJOR_VERSION} diff --git a/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec b/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec index 925d3872..907ea39b 100644 --- a/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec +++ b/root/ppg/staging/18/percona-pg_tde/rpm/pg_tde.spec @@ -28,6 +28,7 @@ URL: https://github.com/%{sname}/%{sname}/ Source0: %{name}-%{version}.tar.gz BuildRequires: meson +BuildRequires: cmake BuildRequires: percona-postgresql%{pgmajorversion}-devel chrpath openssl-devel libcurl-devel zlib-devel libxml2-devel libxslt-devel libselinux-devel pam-devel krb5-devel readline-devel %if 0%{?gts_version} BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c++ gcc-toolset-%{gts_version}-annobin-plugin-gcc @@ -37,6 +38,11 @@ BuildRequires: json-c-devel lz4-devel libzstd-devel numactl-devel %endif %if 0%{?suse_version} BuildRequires: libjson-c-devel liblz4-devel libzstd-devel >= 1.4.0 libnuma-devel +# The C++ KMIP client needs a C++ compiler. Without gcc-c++ in the chroot +# meson falls back to clang++ (pulled in via the llvmjit BuildRequires) while +# C is compiled by gcc; with SUSE's default -flto=auto the mixed toolchain +# produces archives/objects the linker cannot combine. +BuildRequires: gcc-c++ %endif Requires: postgresql%{pgmajorversion}-server curl openssl diff --git a/root/ppg/staging/18/percona-postgresql/obs/_service b/root/ppg/staging/18/percona-postgresql/obs/_service index 6607509c..d7f7bae7 100644 --- a/root/ppg/staging/18/percona-postgresql/obs/_service +++ b/root/ppg/staging/18/percona-postgresql/obs/_service @@ -2,7 +2,7 @@ https://github.com/Percona-Lab/postgres.git git - release-%!{PG_VERSION}.1 + release-%!{PG_VERSION}.2 %!{PG_VERSION} percona-postgresql