From 66c4d04e6c5c8670e3920774efd5911b187df7083ea1b9c400c9fb1fb0d85877 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Fri, 23 Sep 2022 13:53:38 +0000 Subject: [PATCH] - Sync spec file with postgresql15. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql14?expand=0&rev=38 --- PATCH | 12 ++++++++++++ _multibuild | 3 --- postgresql14.changes | 5 +++++ postgresql14.spec | 34 +++++++++++++++++++++++++++++----- 4 files changed, 46 insertions(+), 8 deletions(-) create mode 100644 PATCH delete mode 100644 _multibuild diff --git a/PATCH b/PATCH new file mode 100644 index 0000000..23e83b4 --- /dev/null +++ b/PATCH @@ -0,0 +1,12 @@ +--- /abuild/max/OBS/server:database:postgresql/postgresql14/postgresql14.spec 2022-08-25 16:03:12.219644734 +0200 ++++ /abuild/max/OBS/server:database:postgresql/postgresql15/postgresql15.spec 2022-09-05 17:09:25.327692199 +0200 +@@ -42,6 +41,9 @@ + + %define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") + ++# Only build client libraries of the latest version. ++%define buildlibs (%{pgmajor} == %(rpm -q --qf %{VERSION} postgresql | cut -d. -f1)) ++ + Name: %pgname + %if "@BUILD_FLAVOR@" == "mini" + %define devel devel-mini diff --git a/_multibuild b/_multibuild deleted file mode 100644 index 9317e4b..0000000 --- a/_multibuild +++ /dev/null @@ -1,3 +0,0 @@ - - mini - diff --git a/postgresql14.changes b/postgresql14.changes index d33eb17..52c8c99 100644 --- a/postgresql14.changes +++ b/postgresql14.changes @@ -5,6 +5,11 @@ Thu Sep 22 21:26:36 UTC 2022 - Aaron Puchert Automatically pin to that version if the distribution has a newer unsupported default version. +------------------------------------------------------------------- +Tue Sep 13 12:32:36 UTC 2022 - Reinhard Max + +- Sync spec file with postgresql15. + ------------------------------------------------------------------- Mon Sep 12 07:52:42 UTC 2022 - Andreas Schwab diff --git a/postgresql14.spec b/postgresql14.spec index b3b71da..84c23b3 100644 --- a/postgresql14.spec +++ b/postgresql14.spec @@ -19,8 +19,8 @@ %define pgversion 14.5 %define pgmajor 14 %define pgsuffix %pgmajor -%define buildlibs 1 %define tarversion %{pgversion} +%define latest_supported_llvm_ver 14 ### CUT HERE ### %define pgname postgresql%pgsuffix @@ -42,6 +42,9 @@ %define requires_file() %( readlink -f '%*' | LC_ALL=C xargs -r rpm -q --qf 'Requires: %%{name} >= %%{epoch}:%%{version}\\n' -f | sed -e 's/ (none):/ /' -e 's/ 0:/ /' | grep -v "is not") +# Only build client libraries of the latest version. +%define buildlibs (%{pgmajor} == %(rpm -q --qf %{VERSION} postgresql | cut -d. -f1)) + Name: %pgname %if "@BUILD_FLAVOR@" == "mini" %define devel devel-mini @@ -59,6 +62,14 @@ Name: %pgname %define python python %endif +%if 0%{?suse_version} >= 1500 +%bcond_without liblz4 +%endif + +%if 0%{?sle_version} >= 150100 || 0%{?suse_version} >= 1550 +%bcond_without libzstd +%endif + %if %mini %bcond_with selinux %bcond_with icu @@ -73,6 +84,14 @@ BuildRequires: readline-devel BuildRequires: tcl-devel BuildRequires: timezone BuildRequires: zlib-devel +%if %{with liblz4} +BuildRequires: pkgconfig(liblz4) +%endif + +%if %{with libzstd} +BuildRequires: pkgconfig(libzstd) +%endif + %bcond_without selinux %bcond_without icu %if !%buildlibs @@ -97,7 +116,6 @@ BuildRequires: %libpq %bcond_with llvm %endif %endif -%global latest_supported_llvm_ver 14 %ifnarch %arm %bcond_without check @@ -408,8 +426,8 @@ Summary: Contributed Extensions and Additions to PostgreSQL Group: Productivity/Databases/Tools Provides: postgresql-contrib-implementation = %version-%release Requires: postgresql-contrib-noarch >= %pgmajor -Requires(post): %pgname >= %pgmajor -Requires: %pgname >= %pgmajor +Requires(post): %pgname >= %{version} +Requires: %pgname >= %{version} PreReq: %pgname-server = %version-%release %description contrib @@ -526,6 +544,12 @@ PACKAGE_TARNAME=%pgname %configure \ --with-uuid=e2fs \ --with-libxml \ --with-libxslt \ +%if %{with liblz4} + --with-lz4 \ +%endif +%if %{with libzstd} + --with-zstd \ +%endif %if %{with systemd_notify} --with-systemd \ %endif @@ -588,7 +612,7 @@ mkdir -p %buildroot%pgtestdir/regress install -sm 0755 contrib/spi/{refint.so,autoinc.so} %buildroot%pgtestdir/regress install -sm 0755 src/test/regress/{pg_regress,regress.so} %buildroot%pgtestdir/regress for i in src/test/regress/{data,expected,input,output,sql}; do - cp -r $i %buildroot%pgtestdir/regress/ + test -d $i && cp -r $i %buildroot%pgtestdir/regress/ done install -m 0644 src/test/regress/*_schedule %buildroot%pgtestdir/regress # }}}