SHA256
1
0
forked from pool/postgresql14

- Sync spec file with postgresql15.

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql14?expand=0&rev=38
This commit is contained in:
Reinhard Max 2022-09-23 13:53:38 +00:00 committed by Git OBS Bridge
parent 554fe64b91
commit 66c4d04e6c
4 changed files with 46 additions and 8 deletions

12
PATCH Normal file
View File

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

View File

@ -1,3 +0,0 @@
<multibuild>
<package>mini</package>
</multibuild>

View File

@ -5,6 +5,11 @@ Thu Sep 22 21:26:36 UTC 2022 - Aaron Puchert <aaronpuchert@alice-dsl.net>
Automatically pin to that version if the distribution has a newer Automatically pin to that version if the distribution has a newer
unsupported default version. unsupported default version.
-------------------------------------------------------------------
Tue Sep 13 12:32:36 UTC 2022 - Reinhard Max <max@suse.com>
- Sync spec file with postgresql15.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Sep 12 07:52:42 UTC 2022 - Andreas Schwab <schwab@suse.de> Mon Sep 12 07:52:42 UTC 2022 - Andreas Schwab <schwab@suse.de>

View File

@ -19,8 +19,8 @@
%define pgversion 14.5 %define pgversion 14.5
%define pgmajor 14 %define pgmajor 14
%define pgsuffix %pgmajor %define pgsuffix %pgmajor
%define buildlibs 1
%define tarversion %{pgversion} %define tarversion %{pgversion}
%define latest_supported_llvm_ver 14
### CUT HERE ### ### CUT HERE ###
%define pgname postgresql%pgsuffix %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") %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 Name: %pgname
%if "@BUILD_FLAVOR@" == "mini" %if "@BUILD_FLAVOR@" == "mini"
%define devel devel-mini %define devel devel-mini
@ -59,6 +62,14 @@ Name: %pgname
%define python python %define python python
%endif %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 %if %mini
%bcond_with selinux %bcond_with selinux
%bcond_with icu %bcond_with icu
@ -73,6 +84,14 @@ BuildRequires: readline-devel
BuildRequires: tcl-devel BuildRequires: tcl-devel
BuildRequires: timezone BuildRequires: timezone
BuildRequires: zlib-devel BuildRequires: zlib-devel
%if %{with liblz4}
BuildRequires: pkgconfig(liblz4)
%endif
%if %{with libzstd}
BuildRequires: pkgconfig(libzstd)
%endif
%bcond_without selinux %bcond_without selinux
%bcond_without icu %bcond_without icu
%if !%buildlibs %if !%buildlibs
@ -97,7 +116,6 @@ BuildRequires: %libpq
%bcond_with llvm %bcond_with llvm
%endif %endif
%endif %endif
%global latest_supported_llvm_ver 14
%ifnarch %arm %ifnarch %arm
%bcond_without check %bcond_without check
@ -408,8 +426,8 @@ Summary: Contributed Extensions and Additions to PostgreSQL
Group: Productivity/Databases/Tools Group: Productivity/Databases/Tools
Provides: postgresql-contrib-implementation = %version-%release Provides: postgresql-contrib-implementation = %version-%release
Requires: postgresql-contrib-noarch >= %pgmajor Requires: postgresql-contrib-noarch >= %pgmajor
Requires(post): %pgname >= %pgmajor Requires(post): %pgname >= %{version}
Requires: %pgname >= %pgmajor Requires: %pgname >= %{version}
PreReq: %pgname-server = %version-%release PreReq: %pgname-server = %version-%release
%description contrib %description contrib
@ -526,6 +544,12 @@ PACKAGE_TARNAME=%pgname %configure \
--with-uuid=e2fs \ --with-uuid=e2fs \
--with-libxml \ --with-libxml \
--with-libxslt \ --with-libxslt \
%if %{with liblz4}
--with-lz4 \
%endif
%if %{with libzstd}
--with-zstd \
%endif
%if %{with systemd_notify} %if %{with systemd_notify}
--with-systemd \ --with-systemd \
%endif %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 contrib/spi/{refint.so,autoinc.so} %buildroot%pgtestdir/regress
install -sm 0755 src/test/regress/{pg_regress,regress.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 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 done
install -m 0644 src/test/regress/*_schedule %buildroot%pgtestdir/regress install -m 0644 src/test/regress/*_schedule %buildroot%pgtestdir/regress
# }}} # }}}