diff --git a/root/ppg/staging/16/tde/percona-postgresql/obs/_service b/root/ppg/staging/16/tde/percona-postgresql/obs/_service index 68e8c777..49e1e2b1 100644 --- a/root/ppg/staging/16/tde/percona-postgresql/obs/_service +++ b/root/ppg/staging/16/tde/percona-postgresql/obs/_service @@ -2,7 +2,7 @@ https://github.com/percona/postgres.git git - release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} + PSP-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} %!{PG_VERSION} percona-postgresql diff --git a/root/ppg/staging/17/percona-patroni/debian/control b/root/ppg/staging/17/percona-patroni/debian/control index 0a819644..75e750cb 100644 --- a/root/ppg/staging/17/percona-patroni/debian/control +++ b/root/ppg/staging/17/percona-patroni/debian/control @@ -42,7 +42,7 @@ Homepage: https://github.com/patroni/patroni Package: percona-patroni Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2 , python3-etcd, python3-consul | python3-kazoo | python3-kubernetes, python-six | python3-six, python-requests | python3-requests, python-yaml | python3-yaml, python3-dateutil, python3-yaml, python3-psutil, python3-prettytable, python3-click, python3-cdiff, python3-ydiff, python3-pysyncobj, percona-postgresql-17 | postgresql-17 +Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2 , python3-etcd, python3-consul | python3-kazoo | python3-kubernetes, python-six | python3-six, python-requests | python3-requests, python-yaml | python3-yaml, python3-dateutil, python3-yaml, python3-psutil, python3-prettytable, python3-click, python3-cdiff, python3-ydiff, python3-pysyncobj, python3-systemd, percona-postgresql-17 | postgresql-17 Suggests: etcd-server | consul | zookeeperd, haproxy, percona-patroni-doc Provides: patroni Description: PostgreSQL High Availability with ZooKeeper, etcd, Consul, or Kubernetes diff --git a/root/ppg/staging/17/percona-patroni/rpm/percona-patroni.spec b/root/ppg/staging/17/percona-patroni/rpm/percona-patroni.spec index a5266bf5..d09206ff 100644 --- a/root/ppg/staging/17/percona-patroni/rpm/percona-patroni.spec +++ b/root/ppg/staging/17/percona-patroni/rpm/percona-patroni.spec @@ -1,22 +1,17 @@ %global debug_package %{nil} -%if 0%{?fedora} && 0%{?fedora} == 43 -%global __ospython %{_bindir}/python3.14 -%global python3_pkgversion 3.14 +%if 0%{?fedora} && 0%{?fedora} == 45 +%global __ospython %{_bindir}/python3.15 +%global python3_pkgversion 3.15 %global python3_pkgprefix python3 %endif -%if 0%{?fedora} && 0%{?fedora} <= 42 -%global __ospython %{_bindir}/python3.13 -%global python3_pkgversion 3.13 +%if 0%{?fedora} && 0%{?fedora} <= 44 +%global __ospython %{_bindir}/python3.14 +%global python3_pkgversion 3.14 %global python3_pkgprefix python3 %endif -%if 0%{?rhel} && 0%{?rhel} == 8 -%global __ospython %{_bindir}/python3 -%global python3_pkgversion 3.12 -%global python3_pkgprefix python3.12 -%endif -%if 0%{?rhel} && 0%{?rhel} >= 9 +%if 0%{?rhel} && 0%{?rhel} <= 10 %global __ospython %{_bindir}/python3.12 %global python3_pkgversion 3.12 %global python3_pkgprefix python3.12 @@ -51,12 +46,13 @@ BuildRequires: python%{python3_pkgversion}-devel Requires: %{python3_pkgprefix}-six Requires: %{python3_pkgprefix}-dateutil +Requires: %{python3_pkgprefix}-systemd Requires: %{python3_pkgprefix}-ydiff < 1.5 Requires: %{python3_pkgprefix}-ydiff >= 1.4.2 Requires: %{name}-etcd -%if !0%{?suse_version} +%if !0%{?suse_version} && 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-click Requires: %{python3_pkgprefix}-cryptography >= 1.4 Requires: %{python3_pkgprefix}-prettytable @@ -67,6 +63,17 @@ Requires: %{python3_pkgprefix}-urllib3 >= 1.19.1 Requires: %{python3_pkgprefix}-wcwidth %endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-click +Requires: python%{python3_pkgversion}-cryptography >= 1.4 +Requires: python3-prettytable +Requires: python%{python3_pkgversion}-pyyaml +Requires: python3-psutil +Requires: python%{python3_pkgversion}-urllib3 >= 1.19.1 +Requires: python3-psycopg2 +Requires: python3-wcwidth +%endif + %if 0%{?suse_version} >= 1500 Requires: %{python3_pkgprefix}-click Requires: %{python3_pkgprefix}-cryptography >= 1.4 @@ -100,18 +107,28 @@ Summary: Related components to use patroni with Consul Requires: %{name} = %{epoch}:%{version}-%{release} Requires: consul Requires: %{python3_pkgprefix}-py-consul >= 1.6.0 +%if 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-requests +%endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-requests +%endif %description -n %{name}-consul Meta package to pull consul related dependencies for patroni %package -n %{name}-etcd Summary: Related components to use patroni with etcd Requires: %{name} = %{epoch}:%{version}-%{release} -%if !0%{?suse_version} +%if !0%{?suse_version} && 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-etcd >= 0.4.3 Requires: %{python3_pkgprefix}-dns %endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-etcd >= 0.4.3 +Requires: python3-dns +%endif %if 0%{?suse_version} >= 1500 +Requires: %{python3_pkgprefix}-etcd >= 0.4.3 Requires: %{python3_pkgprefix}-dnspython %endif %description -n %{name}-etcd @@ -120,14 +137,24 @@ Meta package to pull etcd related dependencies for patroni %package -n %{name}-aws Summary: Related components to use patroni on AWS Requires: %{name} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-boto3 +%endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-boto3 +%endif %description -n %{name}-aws Meta package to pull AWS related dependencies for patroni %package -n %{name}-zookeeper Summary: Related components to use patroni with Zookeeper Requires: %{name} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-kazoo >= 1.3.1 +%endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-kazoo >= 1.3.1 +%endif %description -n %{name}-zookeeper Meta package to pull zookeeper related dependencies for patroni diff --git a/root/ppg/staging/17/percona-pg-telemetry/debian/control b/root/ppg/staging/17/percona-pg-telemetry/debian/control index 0bfd6757..10527c3c 100644 --- a/root/ppg/staging/17/percona-pg-telemetry/debian/control +++ b/root/ppg/staging/17/percona-pg-telemetry/debian/control @@ -9,7 +9,6 @@ Build-Depends: Package: percona-pg-telemetry%!{PG_MAJOR_VERSION} Architecture: any Depends: - percona-telemetry-agent, ${misc:Depends}, ${shlibs:Depends}, Description:The percona_pg_telemetry is an extension for Percona telemetry data collection for PostgreSQL. diff --git a/root/ppg/staging/17/percona-pg-telemetry/debian/control.in b/root/ppg/staging/17/percona-pg-telemetry/debian/control.in index fedd5f43..529bbabf 100644 --- a/root/ppg/staging/17/percona-pg-telemetry/debian/control.in +++ b/root/ppg/staging/17/percona-pg-telemetry/debian/control.in @@ -9,7 +9,6 @@ Build-Depends: Package: percona-pg-telemetry17 Architecture: any Depends: - percona-telemetry-agent, ${misc:Depends}, ${shlibs:Depends}, Description:The percona_pg_telemetry is an extension for Percona telemetry data collection for PostgreSQL. diff --git a/root/ppg/staging/17/percona-pg-telemetry/debian/postinst b/root/ppg/staging/17/percona-pg-telemetry/debian/postinst index f5d96da6..35058c69 100644 --- a/root/ppg/staging/17/percona-pg-telemetry/debian/postinst +++ b/root/ppg/staging/17/percona-pg-telemetry/debian/postinst @@ -1,12 +1,11 @@ #!/bin/sh #DEBHELPER# -usermod -a -G percona-telemetry postgres -mkdir /usr/local/percona/telemetry/pg -chown postgres:percona-telemetry /usr/local/percona/telemetry/pg -chmod 775 /usr/local/percona/telemetry/pg -chmod g+s /usr/local/percona/telemetry/pg -chmod u+s /usr/local/percona/telemetry/pg -exit 0 +# Transitional cleanup: percona-pg-telemetry <= 1.1 managed this dir for the +# telemetry-agent. The extension no longer uses it. Remove in a future release. +if [ -d /usr/local/percona/telemetry/pg ] && [ -z "$(ls -A /usr/local/percona/telemetry/pg 2>/dev/null)" ]; then + rmdir /usr/local/percona/telemetry/pg 2>/dev/null || true +fi +exit 0 diff --git a/root/ppg/staging/17/percona-pg-telemetry/debian/postrm b/root/ppg/staging/17/percona-pg-telemetry/debian/postrm index 20107ca2..87bbf5ed 100755 --- a/root/ppg/staging/17/percona-pg-telemetry/debian/postrm +++ b/root/ppg/staging/17/percona-pg-telemetry/debian/postrm @@ -22,15 +22,8 @@ fi case "$1" in remove | purge) - set -e - PG_TELEMETRY=/usr/local/percona/telemetry/pg - if [ -d ${PG_TELEMETRY} ]; - then - rm -rf ${PG_TELEMETRY} - fi - - set +e - + # The extension no longer owns /usr/local/percona/telemetry/pg. + # Leftover empty dirs from <= 1.1 are cleaned in postinst. ;; upgrade | failed-upgrade | abort-install | abort-upgrade | disappear) diff --git a/root/ppg/staging/17/percona-pg-telemetry/rpm/percona-pg-telemetry.spec b/root/ppg/staging/17/percona-pg-telemetry/rpm/percona-pg-telemetry.spec index ccfa5993..c0e6f0ff 100644 --- a/root/ppg/staging/17/percona-pg-telemetry/rpm/percona-pg-telemetry.spec +++ b/root/ppg/staging/17/percona-pg-telemetry/rpm/percona-pg-telemetry.spec @@ -32,7 +32,6 @@ BuildRequires: gcc-toolset-%{gts_version}-gcc gcc-toolset-%{gts_version}-gcc-c+ BuildRequires: chrpath %endif -Requires: percona-telemetry-agent Conflicts: %{sname}%{pgrel} Obsoletes: %{sname}%{pgrel} <= %{version}-%{release} Epoch: 1 @@ -80,11 +79,10 @@ if [ $1 == 1 ]; then fi %post -n %{sname}%{pgrel} -if getent group percona-telemetry > /dev/null 2>&1; then - usermod -a -G percona-telemetry postgres || : - install -d -m 2775 -o postgres -g percona-telemetry /usr/local/percona/telemetry/pg || : -else - install -d -m 2775 -o postgres -g postgres /usr/local/percona/telemetry/pg || : +# Transitional cleanup: percona-pg-telemetry <= 1.1 managed this dir for the +# telemetry-agent. The extension no longer uses it. Remove in a future release. +if [ -d /usr/local/percona/telemetry/pg ] && [ -z "$(ls -A /usr/local/percona/telemetry/pg 2>/dev/null)" ]; then + rmdir /usr/local/percona/telemetry/pg 2>/dev/null || : fi %if 0%{?suse_version} # Update dynamic linker cache for new library path @@ -92,7 +90,6 @@ fi %endif %postun -n %{sname}%{pgrel} -rm -rf /usr/local/percona/telemetry/pg %if 0%{?suse_version} # Update dynamic linker cache after package removal /sbin/ldconfig diff --git a/root/ppg/staging/17/percona-pg_cron/rpm/pg_cron.spec b/root/ppg/staging/17/percona-pg_cron/rpm/pg_cron.spec index 0d797892..29799b95 100644 --- a/root/ppg/staging/17/percona-pg_cron/rpm/pg_cron.spec +++ b/root/ppg/staging/17/percona-pg_cron/rpm/pg_cron.spec @@ -33,19 +33,12 @@ Requires: postgresql%{pgmajorversion}-server Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives -%if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499 -Requires: libopenssl1_0_0 -%else %if 0%{?suse_version} >= 1500 -Requires: libopenssl1_1 -%else -Requires: openssl-libs >= 1.0.2k -%endif +Requires: libopenssl3 +BuildRequires: libopenssl-3-devel %endif - -%if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499 -BuildRequires: libopenssl-devel -%else +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 +Requires: openssl-libs >= 1.1.1k BuildRequires: openssl-devel %endif diff --git a/root/ppg/staging/17/percona-pgbackrest/debian/control b/root/ppg/staging/17/percona-pgbackrest/debian/control index 1c676ec8..ac6f20a8 100644 --- a/root/ppg/staging/17/percona-pgbackrest/debian/control +++ b/root/ppg/staging/17/percona-pgbackrest/debian/control @@ -9,6 +9,7 @@ Build-Depends: debhelper-compat (= 13), libpq-dev, libssh2-1-dev, libssl-dev, + libsystemd-dev, libxml-checker-perl, libxml2-dev, libyaml-dev, diff --git a/root/ppg/staging/17/percona-pgbackrest/debian/rules b/root/ppg/staging/17/percona-pgbackrest/debian/rules index c3b53377..e5c5d4d6 100755 --- a/root/ppg/staging/17/percona-pgbackrest/debian/rules +++ b/root/ppg/staging/17/percona-pgbackrest/debian/rules @@ -44,6 +44,9 @@ override_dh_auto_build: ${MANTEMPLATE} > ${CURDIR}/doc/output/man/pgbackrest.1 dh_auto_build +override_dh_auto_test: + # nothing to do here, see debian/tests/* instead + override_dh_auto_clean: ! [ -f src/Makefile ] || $(MAKE) -C src clean-all diff --git a/root/ppg/staging/17/percona-pgbackrest/rpm/pgbackrest.spec b/root/ppg/staging/17/percona-pgbackrest/rpm/pgbackrest.spec index 615c4d40..1d58a6a3 100644 --- a/root/ppg/staging/17/percona-pgbackrest/rpm/pgbackrest.spec +++ b/root/ppg/staging/17/percona-pgbackrest/rpm/pgbackrest.spec @@ -17,11 +17,11 @@ BuildRequires: gcc openssl-devel zlib-devel percona-postgresql%{pgmajorversion}- BuildRequires: libzstd-devel libxml2-devel libyaml-devel meson %if 0%{?suse_version} >= 1500 -Requires: libopenssl3 +Requires: libopenssl3 libsystemd0 BuildRequires: libopenssl-3-devel %endif %if 0%{?fedora} >= 42 || 0%{?rhel} >= 8 -Requires: openssl-libs >= 1.1.1k +Requires: openssl-libs >= 1.1.1k systemd-libs BuildRequires: openssl-devel %endif @@ -34,7 +34,7 @@ Requires: libssh2 BuildRequires: libssh2-devel %endif %if 0%{?suse_version} && 0%{?suse_version} >= 1500 -Requires: liblz4-1 libzstd1 libssh2-1 +Requires: liblz4-1 libzstd1 libssh2-1 libsystemd0 BuildRequires: liblz4-devel libbz2-devel libssh2-devel ninja %endif diff --git a/root/ppg/staging/17/percona-pgvector/debian/compat b/root/ppg/staging/17/percona-pgvector/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/root/ppg/staging/17/percona-pgvector/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/root/ppg/staging/17/percona-pgvector/debian/control b/root/ppg/staging/17/percona-pgvector/debian/control index b3435610..6b48532e 100644 --- a/root/ppg/staging/17/percona-pgvector/debian/control +++ b/root/ppg/staging/17/percona-pgvector/debian/control @@ -3,7 +3,7 @@ Section: database Priority: optional Maintainer: Percona Development Team Build-Depends: - debhelper (>= 9), + debhelper-compat (= 13), percona-postgresql-server-dev-all (>= 153~), Standards-Version: 4.6.2 Rules-Requires-Root: no diff --git a/root/ppg/staging/17/percona-postgresql-common/debian/compat b/root/ppg/staging/17/percona-postgresql-common/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/root/ppg/staging/17/percona-postgresql-common/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/root/ppg/staging/17/percona-postgresql-common/debian/control b/root/ppg/staging/17/percona-postgresql-common/debian/control index aeaf1665..c4d290f9 100644 --- a/root/ppg/staging/17/percona-postgresql-common/debian/control +++ b/root/ppg/staging/17/percona-postgresql-common/debian/control @@ -5,6 +5,7 @@ Maintainer: Percona Development Team Build-Depends: debhelper (>= 9), debhelper (>= 10.1) | dh-systemd (>= 1.19), + debhelper-compat (= 13), libreadline-dev, Package: percona-postgresql-common diff --git a/root/ppg/staging/17/percona-postgresql-common/debian/supported-versions b/root/ppg/staging/17/percona-postgresql-common/debian/supported-versions index db3ca169..4cd8ae50 100755 --- a/root/ppg/staging/17/percona-postgresql-common/debian/supported-versions +++ b/root/ppg/staging/17/percona-postgresql-common/debian/supported-versions @@ -89,6 +89,7 @@ ubuntu() { 21.04|21.10) /bin/echo -e "17" ;; 22.04|22.10) /bin/echo -e "17" ;; 24.04|24.10) /bin/echo -e "17" ;; + 26.04|26.10) /bin/echo -e "17" ;; *) echo "supported-versions: WARNING: Unknown Ubuntu release: $1" >&2 /bin/echo -e "$DEFAULT" ;; diff --git a/root/ppg/staging/17/percona-postgresql/debian/control b/root/ppg/staging/17/percona-postgresql/debian/control index ce053da6..f9f40fb6 100644 --- a/root/ppg/staging/17/percona-postgresql/debian/control +++ b/root/ppg/staging/17/percona-postgresql/debian/control @@ -7,9 +7,8 @@ Rules-Requires-Root: no Build-Depends: autoconf, bison, - clang [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32], - debhelper, - debhelper-compat (= 10), + clang [amd64 arm64 mips64el ppc64 ppc64el s390x] , + debhelper-compat (= 13), dh-exec (>= 0.13~), docbook-xml, docbook-xsl (>= 1.77), @@ -30,6 +29,7 @@ Build-Depends: liblz4-dev, libpam0g-dev | libpam-dev, libperl-dev, + libpq-dev , libreadline-dev, libselinux1-dev [linux-any], libssl-dev, @@ -37,17 +37,20 @@ Build-Depends: libxml2-dev, libxml2-utils, libxslt1-dev, - llvm-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32], + libzstd-dev (>= 1.4.0) , + llvm-dev [amd64 arm64 mips64el ppc64 ppc64el s390x] , + lz4 | liblz4-tool, mawk, perl (>= 5.8), pkg-config | pkgconf, python3-dev, - systemtap-sdt-dev, + systemtap-sdt-dev [linux-any], tcl-dev, + tzdata , uuid-dev, xsltproc, zlib1g-dev | libz-dev, - libzstd-dev, + zstd (>= 1.4.0) , percona-postgresql-common-dev Homepage: http://www.postgresql.org/ @@ -149,12 +152,11 @@ Depends: ssl-cert, tzdata, curl, - percona-pg-telemetry%!{PG_MAJOR_VERSION}, ${misc:Depends}, ${shlibs:Depends} Provides: percona-postgresql-contrib-%!{PG_MAJOR_VERSION}, postgresql-contrib-%!{PG_MAJOR_VERSION} (= ${binary:Version}), postgresql-%!{PG_MAJOR_VERSION} (= ${binary:Version}), - postgresql-%!{PG_MAJOR_VERSION}-jit-llvm (= ${llvm:Version}) [!alpha !hppa !hurd-amd64 !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32] , -Recommends: sysstat + postgresql-%!{PG_MAJOR_VERSION}-jit-llvm (= ${llvm:Version}) [amd64 arm64 mips64el ppc64 ppc64el s390x] , +Recommends: sysstat, percona-pg-telemetry%!{PG_MAJOR_VERSION} Description: The World's Most Advanced Open Source Relational Database PostgreSQL, also known as Postgres, is a free and open-source relational database management system (RDBMS) emphasizing extensibility and SQL @@ -197,9 +199,9 @@ Package: percona-postgresql-server-dev-%!{PG_MAJOR_VERSION} Architecture: any Section: libdevel Depends: - clang-${llvm:Version} [!alpha !hppa !hurd-amd64 !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32] , + clang-${llvm:Version} [amd64 arm64 mips64el ppc64 ppc64el s390x] , libpq-dev (>= %!{PG_MAJOR_VERSION}~~), - llvm-${llvm:Version}-dev [!alpha !hppa !hurd-amd64 !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !loong64 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32] , + llvm-${llvm:Version}-dev [amd64 arm64 mips64el ppc64 ppc64el s390x] , percona-postgresql-client-%!{PG_MAJOR_VERSION}, percona-postgresql-common (>= 162~), ${misc:Depends}, ${shlibs:Depends} diff --git a/root/ppg/staging/17/percona-postgresql/debian/debian.dsc b/root/ppg/staging/17/percona-postgresql/debian/debian.dsc index 8f53e27f..ed54e850 100644 --- a/root/ppg/staging/17/percona-postgresql/debian/debian.dsc +++ b/root/ppg/staging/17/percona-postgresql/debian/debian.dsc @@ -39,6 +39,7 @@ Build-Depends: liblz4-dev, libpam0g-dev | libpam-dev, libperl-dev, + libpq-dev , libreadline-dev, libselinux1-dev [linux-any], libssl-dev, @@ -47,6 +48,7 @@ Build-Depends: libxml2-utils, libxslt1-dev, llvm-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32], + lz4 | liblz4-tool, mawk, perl (>= 5.8), pkg-config, @@ -60,6 +62,7 @@ Build-Depends: libcurl4-openssl-dev, curl | libz-dev, libzstd-dev, + zstd (>= 1.4.0), percona-postgresql-common-dev Debtransform-Release: 1 Debtransform-Files-Tar: debian.tar.gz diff --git a/root/ppg/staging/17/percona-postgresql/debian/patches/extension_destdir b/root/ppg/staging/17/percona-postgresql/debian/patches/extension_destdir index 9dece1f0..74ea9851 100644 --- a/root/ppg/staging/17/percona-postgresql/debian/patches/extension_destdir +++ b/root/ppg/staging/17/percona-postgresql/debian/patches/extension_destdir @@ -189,15 +189,16 @@ pfree(full); --- a/src/backend/utils/misc/postgresql.conf.sample +++ b/src/backend/utils/misc/postgresql.conf.sample -@@ -757,6 +757,8 @@ +@@ -757,7 +757,9 @@ # - Other Defaults - - + #dynamic_library_path = '$libdir' +#extension_destdir = '' # prepend path when loading extensions + # and shared objects (added by Debian) #gin_fuzzy_search_limit = 0 #output_plugin_libraries = 'pgoutput, test_decoding' # approved plugins for logical decoding - + + --- a/src/backend/utils/misc/guc_tables.c +++ b/src/backend/utils/misc/guc_tables.c @@ -538,6 +538,7 @@ char *ConfigFileName; diff --git a/root/ppg/staging/17/percona-postgresql/obs/_service b/root/ppg/staging/17/percona-postgresql/obs/_service index 00b48570..cfa6cf1c 100644 --- a/root/ppg/staging/17/percona-postgresql/obs/_service +++ b/root/ppg/staging/17/percona-postgresql/obs/_service @@ -2,7 +2,7 @@ https://github.com/percona/postgres.git git - release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} + PSP-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} %!{PG_VERSION} percona-postgresql diff --git a/root/ppg/staging/17/percona-postgresql/rpm/percona-postgresql.spec b/root/ppg/staging/17/percona-postgresql/rpm/percona-postgresql.spec index fac7d0a7..37b38b99 100644 --- a/root/ppg/staging/17/percona-postgresql/rpm/percona-postgresql.spec +++ b/root/ppg/staging/17/percona-postgresql/rpm/percona-postgresql.spec @@ -1,4 +1,5 @@ %undefine _package_note_file +%global _default_patch_fuzz 2 %global pgmajorversion %!{PG_MAJOR_VERSION} @@ -331,7 +332,7 @@ Group: Productivity/Databases/Servers Requires: %{name} >= %{version}-%{release} Requires: %{name}-libs >= %{version}-%{release} Requires(pre): /usr/sbin/useradd /usr/sbin/groupadd -Requires: percona-pg-telemetry%{pgmajorversion} +Recommends: percona-pg-telemetry%{pgmajorversion} Requires: percona-pg_tde%{pgmajorversion} # for /sbin/ldconfig Requires(post): glibc @@ -344,6 +345,7 @@ Requires(preun): systemd Requires(postun): systemd Provides: postgresql-server >= %{version}-%{release} +Provides: group(postgres) user(postgres) Provides: %{vname}-server = %{epoch}:%{version}-%{release} Provides: %{sname}-server = %{epoch}:%{version}-%{release} Obsoletes: %{sname}-server <= %{version}-%{release} @@ -715,7 +717,7 @@ sed "s|C=\`pwd\`;|C=%{pgbaseinstdir}/lib/tutorial;|" < src/tutorial/Makefile > s %{__make} %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all %{__rm} -f src/tutorial/GNUmakefile -%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extensions/ +%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extension/ MAKELEVEL=0 %{__make} %{?_smp_mflags} all %{__make} %{?_smp_mflags} -C contrib all %if %uuid @@ -770,7 +772,7 @@ pushd doc/src; make all; popd %{__make} DESTDIR=%{buildroot} install popd -%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extensions/ +%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extension/ %{__make} -C contrib DESTDIR=%{buildroot} install %if %uuid %{__make} -C contrib/uuid-ossp DESTDIR=%{buildroot} install @@ -1125,7 +1127,9 @@ fi %{pgbaseinstdir}/share/man/man1/pg_dump.* %{pgbaseinstdir}/share/man/man1/pg_dumpall.* %{pgbaseinstdir}/share/man/man1/pg_isready.* +%{pgbaseinstdir}/share/man/man1/pg_receivewal.* %{pgbaseinstdir}/share/man/man1/pg_restore.* +%{pgbaseinstdir}/share/man/man1/pg_waldump.* %{pgbaseinstdir}/share/man/man1/pg_walsummary.* %{pgbaseinstdir}/share/man/man1/psql.* %{pgbaseinstdir}/share/man/man1/reindexdb.* @@ -1184,7 +1188,9 @@ fi %{pgbaseinstdir}/lib/moddatetime.so %{pgbaseinstdir}/lib/pageinspect.so %{pgbaseinstdir}/lib/passwordcheck.so +%if %ssl %{pgbaseinstdir}/lib/pgcrypto.so +%endif %{pgbaseinstdir}/lib/pgrowlocks.so %{pgbaseinstdir}/lib/pgstattuple.so %{pgbaseinstdir}/lib/pg_buffercache.so @@ -1252,7 +1258,9 @@ fi %{pgbaseinstdir}/share/extension/pg_trgm* %{pgbaseinstdir}/share/extension/pg_visibility* %{pgbaseinstdir}/share/extension/pg_walinspect* +%if %ssl %{pgbaseinstdir}/share/extension/pgcrypto* +%endif %{pgbaseinstdir}/share/extension/pgrowlocks* %{pgbaseinstdir}/share/extension/pgstattuple* %{pgbaseinstdir}/share/extension/postgres_fdw* @@ -1322,13 +1330,11 @@ fi %{pgbaseinstdir}/share/man/man1/pg_controldata.* %{pgbaseinstdir}/share/man/man1/pg_ctl.* %{pgbaseinstdir}/share/man/man1/pg_resetwal.* -%{pgbaseinstdir}/share/man/man1/pg_receivewal.* %{pgbaseinstdir}/share/man/man1/pg_rewind.1 %{pgbaseinstdir}/share/man/man1/pg_test_fsync.1 %{pgbaseinstdir}/share/man/man1/pg_test_timing.1 %{pgbaseinstdir}/share/man/man1/pg_upgrade.1 %{pgbaseinstdir}/share/man/man1/pg_verifybackup.* -%{pgbaseinstdir}/share/man/man1/pg_waldump.1 %{pgbaseinstdir}/share/man/man1/postgres.* %{pgbaseinstdir}/share/postgres.bki %{pgbaseinstdir}/share/system_constraints.sql @@ -1416,6 +1422,7 @@ fi %endif %files plpython3 -f pg_plpython3.lst +%defattr(-,root,root) %dir %{pgbaseinstdir}/share/locale %{pgbaseinstdir}/share/extension/plpython3* %{pgbaseinstdir}/lib/plpython3.so diff --git a/root/ppg/staging/18/percona-patroni/debian/control b/root/ppg/staging/18/percona-patroni/debian/control index b4ca40c9..3383e5be 100644 --- a/root/ppg/staging/18/percona-patroni/debian/control +++ b/root/ppg/staging/18/percona-patroni/debian/control @@ -42,7 +42,7 @@ Homepage: https://github.com/patroni/patroni Package: percona-patroni Architecture: all -Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2 , python3-etcd, python3-consul | python3-kazoo | python3-kubernetes, python-six | python3-six, python-requests | python3-requests, python-yaml | python3-yaml, python3-dateutil, python3-yaml, python3-psutil, python3-prettytable, python3-click, python3-cdiff, python3-ydiff, python3-pysyncobj, percona-postgresql-18 | postgresql-18 +Depends: ${misc:Depends}, ${python3:Depends}, lsb-base (>= 3.0-6), python3-psycopg2 , python3-etcd, python3-consul | python3-kazoo | python3-kubernetes, python-six | python3-six, python-requests | python3-requests, python-yaml | python3-yaml, python3-dateutil, python3-yaml, python3-psutil, python3-prettytable, python3-click, python3-cdiff, python3-ydiff, python3-pysyncobj, python3-systemd, percona-postgresql-18 | postgresql-18 Suggests: etcd-server | consul | zookeeperd, haproxy, percona-patroni-doc Provides: patroni Description: PostgreSQL High Availability with ZooKeeper, etcd, Consul, or Kubernetes diff --git a/root/ppg/staging/18/percona-patroni/rpm/percona-patroni.spec b/root/ppg/staging/18/percona-patroni/rpm/percona-patroni.spec index 5e6b57df..cd271724 100644 --- a/root/ppg/staging/18/percona-patroni/rpm/percona-patroni.spec +++ b/root/ppg/staging/18/percona-patroni/rpm/percona-patroni.spec @@ -1,22 +1,17 @@ %global debug_package %{nil} -%if 0%{?fedora} && 0%{?fedora} == 43 -%global __ospython %{_bindir}/python3.14 -%global python3_pkgversion 3.14 +%if 0%{?fedora} && 0%{?fedora} == 45 +%global __ospython %{_bindir}/python3.15 +%global python3_pkgversion 3.15 %global python3_pkgprefix python3 %endif -%if 0%{?fedora} && 0%{?fedora} <= 42 -%global __ospython %{_bindir}/python3.13 -%global python3_pkgversion 3.13 +%if 0%{?fedora} && 0%{?fedora} <= 44 +%global __ospython %{_bindir}/python3.14 +%global python3_pkgversion 3.14 %global python3_pkgprefix python3 %endif -%if 0%{?rhel} && 0%{?rhel} == 8 -%global __ospython %{_bindir}/python3 -%global python3_pkgversion 3.12 -%global python3_pkgprefix python3.12 -%endif -%if 0%{?rhel} && 0%{?rhel} >= 9 +%if 0%{?rhel} && 0%{?rhel} <= 10 %global __ospython %{_bindir}/python3.12 %global python3_pkgversion 3.12 %global python3_pkgprefix python3.12 @@ -51,12 +46,13 @@ BuildRequires: python%{python3_pkgversion}-devel Requires: %{python3_pkgprefix}-six Requires: %{python3_pkgprefix}-dateutil +Requires: %{python3_pkgprefix}-systemd Requires: %{python3_pkgprefix}-ydiff < 1.5 Requires: %{python3_pkgprefix}-ydiff >= 1.4.2 Requires: %{name}-etcd -%if !0%{?suse_version} +%if !0%{?suse_version} && 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-click Requires: %{python3_pkgprefix}-cryptography >= 1.4 Requires: %{python3_pkgprefix}-prettytable @@ -67,6 +63,17 @@ Requires: %{python3_pkgprefix}-urllib3 >= 1.19.1 Requires: %{python3_pkgprefix}-wcwidth %endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-click +Requires: python%{python3_pkgversion}-cryptography >= 1.4 +Requires: python3-prettytable +Requires: python%{python3_pkgversion}-pyyaml +Requires: python3-psutil +Requires: python%{python3_pkgversion}-urllib3 >= 1.19.1 +Requires: python3-psycopg2 +Requires: python3-wcwidth +%endif + %if 0%{?suse_version} >= 1500 Requires: %{python3_pkgprefix}-click Requires: %{python3_pkgprefix}-cryptography >= 1.4 @@ -100,18 +107,28 @@ Summary: Related components to use patroni with Consul Requires: %{name} = %{epoch}:%{version}-%{release} Requires: consul Requires: %{python3_pkgprefix}-py-consul >= 1.6.0 +%if 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-requests +%endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-requests +%endif %description -n %{name}-consul Meta package to pull consul related dependencies for patroni %package -n %{name}-etcd Summary: Related components to use patroni with etcd Requires: %{name} = %{epoch}:%{version}-%{release} -%if !0%{?suse_version} +%if !0%{?suse_version} && 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-etcd >= 0.4.3 Requires: %{python3_pkgprefix}-dns %endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-etcd >= 0.4.3 +Requires: python3-dns +%endif %if 0%{?suse_version} >= 1500 +Requires: %{python3_pkgprefix}-etcd >= 0.4.3 Requires: %{python3_pkgprefix}-dnspython %endif %description -n %{name}-etcd @@ -120,14 +137,24 @@ Meta package to pull etcd related dependencies for patroni %package -n %{name}-aws Summary: Related components to use patroni on AWS Requires: %{name} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-boto3 +%endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-boto3 +%endif %description -n %{name}-aws Meta package to pull AWS related dependencies for patroni %package -n %{name}-zookeeper Summary: Related components to use patroni with Zookeeper Requires: %{name} = %{epoch}:%{version}-%{release} +%if 0%{?rhel} != 10 Requires: %{python3_pkgprefix}-kazoo >= 1.3.1 +%endif +%if 0%{?rhel} && 0%{?rhel} == 10 +Requires: python3-kazoo >= 1.3.1 +%endif %description -n %{name}-zookeeper Meta package to pull zookeeper related dependencies for patroni diff --git a/root/ppg/staging/18/percona-pg_cron/rpm/pg_cron.spec b/root/ppg/staging/18/percona-pg_cron/rpm/pg_cron.spec index 0d797892..29799b95 100644 --- a/root/ppg/staging/18/percona-pg_cron/rpm/pg_cron.spec +++ b/root/ppg/staging/18/percona-pg_cron/rpm/pg_cron.spec @@ -33,19 +33,12 @@ Requires: postgresql%{pgmajorversion}-server Requires(post): %{_sbindir}/update-alternatives Requires(postun): %{_sbindir}/update-alternatives -%if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499 -Requires: libopenssl1_0_0 -%else %if 0%{?suse_version} >= 1500 -Requires: libopenssl1_1 -%else -Requires: openssl-libs >= 1.0.2k -%endif +Requires: libopenssl3 +BuildRequires: libopenssl-3-devel %endif - -%if 0%{?suse_version} >= 1315 && 0%{?suse_version} <= 1499 -BuildRequires: libopenssl-devel -%else +%if 0%{?fedora} >= 41 || 0%{?rhel} >= 8 +Requires: openssl-libs >= 1.1.1k BuildRequires: openssl-devel %endif diff --git a/root/ppg/staging/18/percona-pgbackrest/debian/control b/root/ppg/staging/18/percona-pgbackrest/debian/control index e4ec7f4f..dd896013 100644 --- a/root/ppg/staging/18/percona-pgbackrest/debian/control +++ b/root/ppg/staging/18/percona-pgbackrest/debian/control @@ -11,6 +11,7 @@ Build-Depends: mawk, libpq-dev, libssh2-1-dev, libssl-dev, + libsystemd-dev, libxml-checker-perl, libxml2-dev, libyaml-dev, diff --git a/root/ppg/staging/18/percona-pgbackrest/debian/rules b/root/ppg/staging/18/percona-pgbackrest/debian/rules index c3b53377..e5c5d4d6 100755 --- a/root/ppg/staging/18/percona-pgbackrest/debian/rules +++ b/root/ppg/staging/18/percona-pgbackrest/debian/rules @@ -44,6 +44,9 @@ override_dh_auto_build: ${MANTEMPLATE} > ${CURDIR}/doc/output/man/pgbackrest.1 dh_auto_build +override_dh_auto_test: + # nothing to do here, see debian/tests/* instead + override_dh_auto_clean: ! [ -f src/Makefile ] || $(MAKE) -C src clean-all diff --git a/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec b/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec index c6b810a2..6f9fe5c1 100644 --- a/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec +++ b/root/ppg/staging/18/percona-pgbackrest/rpm/pgbackrest.spec @@ -27,11 +27,11 @@ BuildRequires: libssh2-devel BuildRequires: libcurl-devel %if 0%{?suse_version} >= 1500 -Requires: libopenssl3 +Requires: libopenssl3 libsystemd0 BuildRequires: libopenssl-3-devel %endif %if 0%{?fedora} >= 42 || 0%{?rhel} >= 8 -Requires: openssl-libs >= 1.1.1k +Requires: openssl-libs >= 1.1.1k systemd-libs BuildRequires: openssl-devel %endif @@ -43,7 +43,7 @@ Requires: lz4-libs libzstd Requires: libssh2 %endif %if 0%{?suse_version} && 0%{?suse_version} >= 1500 -Requires: liblz4-1 libzstd1 libssh2-1 +Requires: liblz4-1 libzstd1 libssh2-1 libsystemd0 BuildRequires: liblz4-devel libbz2-devel libssh2-devel ninja %endif diff --git a/root/ppg/staging/18/percona-pgvector/debian/compat b/root/ppg/staging/18/percona-pgvector/debian/compat deleted file mode 100644 index f599e28b..00000000 --- a/root/ppg/staging/18/percona-pgvector/debian/compat +++ /dev/null @@ -1 +0,0 @@ -10 diff --git a/root/ppg/staging/18/percona-pgvector/debian/control b/root/ppg/staging/18/percona-pgvector/debian/control index b3435610..6b48532e 100644 --- a/root/ppg/staging/18/percona-pgvector/debian/control +++ b/root/ppg/staging/18/percona-pgvector/debian/control @@ -3,7 +3,7 @@ Section: database Priority: optional Maintainer: Percona Development Team Build-Depends: - debhelper (>= 9), + debhelper-compat (= 13), percona-postgresql-server-dev-all (>= 153~), Standards-Version: 4.6.2 Rules-Requires-Root: no diff --git a/root/ppg/staging/18/percona-postgis/rpm/percona-postgis.spec b/root/ppg/staging/18/percona-postgis/rpm/percona-postgis.spec index 21b5bc61..532ef541 100644 --- a/root/ppg/staging/18/percona-postgis/rpm/percona-postgis.spec +++ b/root/ppg/staging/18/percona-postgis/rpm/percona-postgis.spec @@ -322,14 +322,14 @@ LDFLAGS="$LDFLAGS -L%{geosinstdir}/lib64 -lgeos_c -L%{projinstdir}/lib64 -L%{gda CFLAGS="$CFLAGS -I%{gdalinstdir}/include"; export CFLAGS export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:%{projinstdir}/lib64/pkgconfig export PATH=/usr/bin:$PATH -%if 0%{?gts_version} -source /opt/rh/gcc-toolset-%{gts_version}/enable -%endif export ACLOCAL=aclocal export AUTOMAKE=automake export AUTOCONF=autoconf sh -x autogen.sh autoconf +%if 0%{?gts_version} +source /opt/rh/gcc-toolset-%{gts_version}/enable +%endif %configure --with-pgconfig=%{pginstdir}/bin/pg_config \ --bindir=%{pginstdir}/bin/ \ diff --git a/root/ppg/staging/18/percona-postgresql-common/debian/compat b/root/ppg/staging/18/percona-postgresql-common/debian/compat deleted file mode 100644 index 48082f72..00000000 --- a/root/ppg/staging/18/percona-postgresql-common/debian/compat +++ /dev/null @@ -1 +0,0 @@ -12 diff --git a/root/ppg/staging/18/percona-postgresql-common/debian/control b/root/ppg/staging/18/percona-postgresql-common/debian/control index 04e4a48d..09bb0dc7 100644 --- a/root/ppg/staging/18/percona-postgresql-common/debian/control +++ b/root/ppg/staging/18/percona-postgresql-common/debian/control @@ -5,6 +5,7 @@ Maintainer: Percona Development Team Build-Depends: debhelper (>= 9), debhelper (>= 10.1) | dh-systemd (>= 1.19), + debhelper-compat (= 13), libreadline-dev, Package: percona-postgresql-common diff --git a/root/ppg/staging/18/percona-postgresql-common/debian/supported-versions b/root/ppg/staging/18/percona-postgresql-common/debian/supported-versions index 269dbdf8..2c5bb475 100755 --- a/root/ppg/staging/18/percona-postgresql-common/debian/supported-versions +++ b/root/ppg/staging/18/percona-postgresql-common/debian/supported-versions @@ -89,6 +89,7 @@ ubuntu() { 21.04|21.10) /bin/echo -e "18" ;; 22.04|22.10) /bin/echo -e "18" ;; 24.04|24.10) /bin/echo -e "18" ;; + 26.04|26.10) /bin/echo -e "18" ;; *) echo "supported-versions: WARNING: Unknown Ubuntu release: $1" >&2 /bin/echo -e "$DEFAULT" ;; diff --git a/root/ppg/staging/18/percona-postgresql/debian/control b/root/ppg/staging/18/percona-postgresql/debian/control index 962047b7..0de61a87 100644 --- a/root/ppg/staging/18/percona-postgresql/debian/control +++ b/root/ppg/staging/18/percona-postgresql/debian/control @@ -36,6 +36,7 @@ Build-Depends: libxslt1-dev, libzstd-dev (>= 1.4.0), llvm-dev | llvm-21-dev [amd64 arm64 mips64el ppc64 ppc64el s390x], + lz4 | liblz4-tool, mawk, openssl, perl (>= 5.8), diff --git a/root/ppg/staging/18/percona-postgresql/debian/debian.dsc b/root/ppg/staging/18/percona-postgresql/debian/debian.dsc index 2917f97c..57dc5141 100644 --- a/root/ppg/staging/18/percona-postgresql/debian/debian.dsc +++ b/root/ppg/staging/18/percona-postgresql/debian/debian.dsc @@ -50,6 +50,7 @@ Build-Depends: autoconf, libxml2-utils, libxslt1-dev, llvm-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32] | llvm-21-dev [!alpha !hppa !hurd-i386 !ia64 !kfreebsd-amd64 !kfreebsd-i386 !m68k !powerpc !riscv64 !sh4 !sparc64 !x32], + lz4 | liblz4-tool, mawk, openssl, perl (>= 5.8), diff --git a/root/ppg/staging/18/percona-postgresql/obs/_service b/root/ppg/staging/18/percona-postgresql/obs/_service index 63ce7cb4..1558bd7b 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/postgres.git git - release-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} + PSP-%!{PG_VERSION}.%!{PERCONA_PG_PATCH_VERSION} %!{PG_VERSION} percona-postgresql diff --git a/root/ppg/staging/18/percona-postgresql/rpm/percona-postgresql.spec b/root/ppg/staging/18/percona-postgresql/rpm/percona-postgresql.spec index 819e928c..81a1d79a 100644 --- a/root/ppg/staging/18/percona-postgresql/rpm/percona-postgresql.spec +++ b/root/ppg/staging/18/percona-postgresql/rpm/percona-postgresql.spec @@ -1,6 +1,7 @@ %global pgmajorversion %!{PG_MAJOR_VERSION} %undefine _package_note_file +%global _default_patch_fuzz 2 # These are macros to be used with find_lang and other stuff %global packageversion %{pgmajorversion}0 @@ -318,6 +319,7 @@ Requires(preun): systemd Requires(postun): systemd %endif Provides: postgresql-server >= %{version}-%{release} +Provides: group(postgres) user(postgres) Provides: %{vname}-server = %{epoch}:%{version}-%{release} Provides: %{sname}-server = %{epoch}:%{version}-%{release} Obsoletes: %{sname}-server <= %{version}-%{release} @@ -666,7 +668,7 @@ sed "s|C=\`pwd\`;|C=%{pgbaseinstdir}/lib/tutorial;|" < src/tutorial/Makefile > s %{__make} %{?_smp_mflags} -C src/tutorial NO_PGXS=1 all %{__rm} -f src/tutorial/GNUmakefile -%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extensions/ +%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extension/ MAKELEVEL=0 %{__make} %{?_smp_mflags} all %{__make} %{?_smp_mflags} -C contrib all %if %uuid @@ -725,7 +727,7 @@ pushd doc/src; make all; popd popd %endif -%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extensions/ +%{__mkdir} -p %{buildroot}%{pgbaseinstdir}/share/extension/ %{__make} -C contrib DESTDIR=%{buildroot} install %if %uuid %{__make} -C contrib/uuid-ossp DESTDIR=%{buildroot} install @@ -786,7 +788,7 @@ touch -r %{SOURCE10} %{sname}-%{pgmajorversion}-check-db-dir %{__install} -d -m 700 %{buildroot}/var/lib/pgsql/%{pgmajorversion}/backups # Create the multiple PostgreSQL version startup directory -%{__install} -d -m 700 %{buildroot}/etc/sysconfig/pgsql/%{pgmajorversion} +%{__install} -d -m 700 %{buildroot}/etc/sysconfig/pgsql/ # Install linker conf file under postgresql installation directory. # We will install the latest version via alternatives. @@ -1008,6 +1010,7 @@ if [ "$1" -eq 0 ] %{_sbindir}/update-alternatives --remove pgsql-pg_restore %{pgbaseinstdir}/bin/pg_restore %{_sbindir}/update-alternatives --remove pgsql-pg_restoreman %{pgbaseinstdir}/share/man/man1/pg_restore.1 %{_sbindir}/update-alternatives --remove pgsql-pg_walsummary %{pgbaseinstdir}/bin/pg_walsummary + %{_sbindir}/update-alternatives --remove pgsql-pg_walsummaryman %{pgbaseinstdir}/share/man/man1/pg_walsummary.1 %{_sbindir}/update-alternatives --remove pgsql-psqlman %{pgbaseinstdir}/share/man/man1/psql.1 %{_sbindir}/update-alternatives --remove pgsql-reindexdb %{pgbaseinstdir}/bin/reindexdb %{_sbindir}/update-alternatives --remove pgsql-reindexdbman %{pgbaseinstdir}/share/man/man1/reindexdb.1 @@ -1082,7 +1085,9 @@ fi %{pgbaseinstdir}/share/man/man1/pg_dump.* %{pgbaseinstdir}/share/man/man1/pg_dumpall.* %{pgbaseinstdir}/share/man/man1/pg_isready.* +%{pgbaseinstdir}/share/man/man1/pg_receivewal.* %{pgbaseinstdir}/share/man/man1/pg_restore.* +%{pgbaseinstdir}/share/man/man1/pg_waldump.* %{pgbaseinstdir}/share/man/man1/pg_walsummary.* %{pgbaseinstdir}/share/man/man1/psql.* %{pgbaseinstdir}/share/man/man1/reindexdb.* @@ -1144,7 +1149,9 @@ fi %{pgbaseinstdir}/lib/moddatetime.so %{pgbaseinstdir}/lib/pageinspect.so %{pgbaseinstdir}/lib/passwordcheck.so +%if %ssl %{pgbaseinstdir}/lib/pgcrypto.so +%endif %{pgbaseinstdir}/lib/pgrowlocks.so %{pgbaseinstdir}/lib/pgstattuple.so %{pgbaseinstdir}/lib/pg_buffercache.so @@ -1213,7 +1220,9 @@ fi %{pgbaseinstdir}/share/extension/pg_trgm* %{pgbaseinstdir}/share/extension/pg_visibility* %{pgbaseinstdir}/share/extension/pg_walinspect* +%if %ssl %{pgbaseinstdir}/share/extension/pgcrypto* +%endif %{pgbaseinstdir}/share/extension/pgrowlocks* %{pgbaseinstdir}/share/extension/pgstattuple* %{pgbaseinstdir}/share/extension/postgres_fdw* @@ -1291,13 +1300,11 @@ fi %{pgbaseinstdir}/share/man/man1/pg_controldata.* %{pgbaseinstdir}/share/man/man1/pg_ctl.* %{pgbaseinstdir}/share/man/man1/pg_resetwal.* -%{pgbaseinstdir}/share/man/man1/pg_receivewal.* %{pgbaseinstdir}/share/man/man1/pg_rewind.1 %{pgbaseinstdir}/share/man/man1/pg_test_fsync.1 %{pgbaseinstdir}/share/man/man1/pg_test_timing.1 %{pgbaseinstdir}/share/man/man1/pg_upgrade.1 %{pgbaseinstdir}/share/man/man1/pg_verifybackup.* -%{pgbaseinstdir}/share/man/man1/pg_waldump.1 %{pgbaseinstdir}/share/man/man1/postgres.* %{pgbaseinstdir}/share/postgres.bki %{pgbaseinstdir}/share/system_constraints.sql @@ -1391,6 +1398,7 @@ fi %if %plpython3 %files plpython3 -f pg_plpython3.lst +%defattr(-,root,root) %dir %{pgbaseinstdir}/share/locale %{pgbaseinstdir}/share/extension/plpython3* %{pgbaseinstdir}/lib/plpython3.so