From d5ab306d62604dce547050a3162a47f09fed951c9f16c5e995fbe2a1ea65ee66 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Thu, 10 Nov 2022 16:35:53 +0000 Subject: [PATCH] - bsc#1205300: Update to 14.6: * https://www.postgresql.org/about/news/2543/ * https://www.postgresql.org/docs/14/release-14-6.html - Sync spec file with postgresql15. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql14?expand=0&rev=42 --- postgresql-14.5.tar.bz2 | 3 -- postgresql-14.5.tar.bz2.sha256 | 1 - postgresql-14.6.tar.bz2 | 3 ++ postgresql-14.6.tar.bz2.sha256 | 1 + postgresql14.changes | 8 +++++ postgresql14.spec | 55 ++++++++++++++++------------------ 6 files changed, 37 insertions(+), 34 deletions(-) delete mode 100644 postgresql-14.5.tar.bz2 delete mode 100644 postgresql-14.5.tar.bz2.sha256 create mode 100644 postgresql-14.6.tar.bz2 create mode 100644 postgresql-14.6.tar.bz2.sha256 diff --git a/postgresql-14.5.tar.bz2 b/postgresql-14.5.tar.bz2 deleted file mode 100644 index c3df31d..0000000 --- a/postgresql-14.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30 -size 22132996 diff --git a/postgresql-14.5.tar.bz2.sha256 b/postgresql-14.5.tar.bz2.sha256 deleted file mode 100644 index 311ec4b..0000000 --- a/postgresql-14.5.tar.bz2.sha256 +++ /dev/null @@ -1 +0,0 @@ -d4f72cb5fb857c9a9f75ec8cf091a1771272802f2178f0b2e65b7b6ff64f4a30 postgresql-14.5.tar.bz2 diff --git a/postgresql-14.6.tar.bz2 b/postgresql-14.6.tar.bz2 new file mode 100644 index 0000000..3bd4fe9 --- /dev/null +++ b/postgresql-14.6.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:508840fc1809d39ab72274d5f137dabb9fd7fb4f933da4168aeebb20069edf22 +size 22177474 diff --git a/postgresql-14.6.tar.bz2.sha256 b/postgresql-14.6.tar.bz2.sha256 new file mode 100644 index 0000000..85cfbbe --- /dev/null +++ b/postgresql-14.6.tar.bz2.sha256 @@ -0,0 +1 @@ +508840fc1809d39ab72274d5f137dabb9fd7fb4f933da4168aeebb20069edf22 postgresql-14.6.tar.bz2 diff --git a/postgresql14.changes b/postgresql14.changes index 52c8c99..fd5f624 100644 --- a/postgresql14.changes +++ b/postgresql14.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Nov 10 16:26:12 UTC 2022 - Reinhard Max + +- bsc#1205300: Update to 14.6: + * https://www.postgresql.org/about/news/2543/ + * https://www.postgresql.org/docs/14/release-14-6.html +- Sync spec file with postgresql15. + ------------------------------------------------------------------- Thu Sep 22 21:26:36 UTC 2022 - Aaron Puchert diff --git a/postgresql14.spec b/postgresql14.spec index 13ca532..2cfae26 100644 --- a/postgresql14.spec +++ b/postgresql14.spec @@ -16,7 +16,7 @@ # -%define pgversion 14.5 +%define pgversion 14.6 %define pgmajor 14 %define pgsuffix %pgmajor %define buildlibs 0 @@ -24,8 +24,7 @@ %define latest_supported_llvm_ver 14 ### CUT HERE ### -%define pgname postgresql%pgsuffix -%define priority %pgsuffix +%define pgname postgresql%pgmajor %define libpq libpq5 %define libecpg libecpg6 %define libpq_so libpq.so.5 @@ -52,9 +51,9 @@ Name: %pgname %define mini 0 %endif -# Use Python 2 for PostgreSQL 9.x on all platforms and for PostgreSQL 10 on SLE12. +# Use Python 2 for for PostgreSQL 10 on SLE12. # Use Python 3 for everything else. -%if %pgsuffix < 90 && ( 0%{?is_opensuse} || 0%{?sle_version} >= 150000 || %pgsuffix > 10 ) +%if 0%{?is_opensuse} || 0%{?sle_version} >= 150000 || %pgmajor > 10 %define python python3 %else %define python python @@ -104,7 +103,7 @@ BuildRequires: %libpq %bcond_with systemd_notify %endif -%if 0%{?suse_version} >= 1500 && %pgsuffix >= 11 && %pgsuffix < 90 +%if 0%{?suse_version} >= 1500 && %pgmajor >= 11 %ifarch riscv64 %bcond_with llvm %else @@ -121,7 +120,7 @@ BuildRequires: %libpq %bcond_with check %endif -%if ( %pgsuffix >= 11 && %pgsuffix < 90 ) || %mini +%if %pgmajor >= 11 || %mini %bcond_without server_devel %else %bcond_with server_devel @@ -163,8 +162,8 @@ License: PostgreSQL Group: Productivity/Databases/Tools Version: %pgversion Release: 0 -Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{tarversion}.tar.bz2 -Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{tarversion}.tar.bz2.sha256 +Source0: https://ftp.postgresql.org/pub/source/v%{tarversion}/postgresql-%{tarversion}.tar.bz2 +Source1: https://ftp.postgresql.org/pub/source/v%{tarversion}/postgresql-%{tarversion}.tar.bz2.sha256 Source2: baselibs.conf Source3: postgresql-README.SUSE Source17: postgresql-rpmlintrc @@ -301,7 +300,7 @@ types and functions. This package contains the header files and libraries needed to compile C extensions that link into the PostgreSQL server. For building client -applications, see the postgresql%pgsuffix-devel package. +applications, see the postgresql%pgmajor-devel package. %endif %description %devel @@ -317,7 +316,7 @@ need to install this package if you want to develop applications in C which will interact with a PostgreSQL server. For building PostgreSQL server extensions, see the -postgresql%pgsuffix-server-devel package. +postgresql%pgmajor-server-devel package. %package server Summary: The Programs Needed to Create and Run a PostgreSQL Server @@ -645,7 +644,7 @@ cp doc/KNOWN_BUGS doc/MISSING_FEATURES COPYRIGHT \ cp -a %SOURCE3 %buildroot%pgdocdir/README.SUSE # Use versioned names for the man pages: for f in %buildroot%pgmandir/man*/*; do - mv $f ${f}pg%pgsuffix + mv $f ${f}pg%pgmajor done %endif @@ -712,6 +711,9 @@ genlists server \ pg_resetwal \ pg_waldump \ pg_resetxlog \ +%if %pgmajor >= 15 + pg_upgrade \ +%endif postgres \ postmaster @@ -722,7 +724,9 @@ genlists contrib \ pg_amcheck \ pg_standby \ pg_test_fsync \ +%if %pgmajor < 15 pg_upgrade \ +%endif pgbench \ vacuumlo \ pg_test_timing @@ -752,7 +756,7 @@ done popd mkdir -p %buildroot%pgmandir/man1 -cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgsuffix +cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor %find_lang ecpg-$VLANG devel.files ln -s %pgbindir/ecpg %buildroot%_bindir/ecpg @@ -792,25 +796,25 @@ awk -v P=%buildroot '/^(%lang|[^%])/{print P $NF}' libpq.files libecpg.files | x %if %{with server_devel} %post server-devel %endif -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %postun %devel /sbin/ldconfig %if %{with server_devel} %postun server-devel %endif -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %if !%mini %postun -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %post -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %post server -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %preun server # Stop only when we are uninstalling the currently running version @@ -833,7 +837,7 @@ if [ "$FIRST_ARG" -eq 0 ]; then fi %postun server -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor # Restart only when we are updating the currently running version # or from the old packaging scheme test -n "$FIRST_ARG" || FIRST_ARG="$1" @@ -857,10 +861,10 @@ if [ "$FIRST_ARG" -ge 1 ]; then fi %post contrib -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %postun contrib -/usr/share/postgresql/install-alternatives %priority +/usr/share/postgresql/install-alternatives %pgmajor %if %buildlibs %post -n %libpq -p /sbin/ldconfig @@ -907,9 +911,7 @@ fi %dir %pgbasedir %dir %pgextensiondir %dir %pglibdir -%if %pgsuffix < 90 %pglibdir/pgoutput.so -%endif %pglibdir/plpgsql.so %pglibdir/dict_snowball.so %pgdatadir/tsearch_data @@ -920,9 +922,6 @@ fi %if %buildlibs %exclude %pgdatadir/pg_service.conf.sample %endif -%if %pgsuffix > 90 -%exclude %pgdatadir/*.pltcl -%endif %pglibdir/*_and_*.so %pglibdir/euc2004_sjis2004.so %pglibdir/libpqwalreceiver.so @@ -945,10 +944,6 @@ fi %defattr(-,root,root) %pgextensiondir/pltcl* %pglibdir/pltcl.so -%if %pgsuffix > 90 -%pgdatadir/*.pltcl -%pgbindir/pltcl* -%endif %files plperl -f plperl.lang %defattr(-,root,root)