pool/postgresql13
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 923701 from server:database:postgresql

Browse Source 
- Stop building the mini and lib packages as they are now coming
  from postgresql14.
- Let genlists skip non-existing binaries to avoid lots of version
  conditionals in the file lists.
- Remove postgresql-testsuite-int8.sql.patch, because its purpose
  is unclear. This affects only the test subpackage.

OBS-URL: https://build.opensuse.org/request/show/923701
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/postgresql13?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger 2021-10-12 19:48:00 +00:00 committed by Git OBS Bridge
commit 75560c4a56
4 changed files with 16 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_multibuild
View File

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

46
postgresql-testsuite-int8.sql.patch
View File

@ -1,46 +0,0 @@
commit a210bee6273041cf9773383e2dda58a7d7c84be4
Author: yac <yac@blesmrt.net>
Date: Fri Mar 8 17:56:58 2013 +0100
+ SET LC_
--- src/test/regress/expected/int8.out.orig
+++ src/test/regress/expected/int8.out
@@ -580,6 +580,7 @@ SELECT '' AS to_char_12, to_char(q2, 'FM
| -4567890123456789.000
(5 rows)
+SET LC_MONETARY='C';
SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL;
to_char_13 | to_char
------------+------------------------
--- src/test/regress/expected/numeric.out.orig
+++ src/test/regress/expected/numeric.out
@@ -1079,6 +1079,7 @@ SELECT '' AS to_char_15, to_char(val, 'F
| -24926804.04504742
(10 rows)
+SET LC_MONETARY='C';
SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data;
to_char_16 | to_char
------------+------------------------------------
--- src/test/regress/sql/int8.sql.orig
+++ src/test/regress/sql/int8.sql
@@ -116,6 +116,7 @@ SELECT '' AS to_char_9, to_char(q2, '09
SELECT '' AS to_char_10, to_char(q2, 'S0999999999999999') FROM INT8_TBL;
SELECT '' AS to_char_11, to_char(q2, 'FM0999999999999999') FROM INT8_TBL;
SELECT '' AS to_char_12, to_char(q2, 'FM9999999999999999.000') FROM INT8_TBL;
+SET LC_MONETARY='C';
SELECT '' AS to_char_13, to_char(q2, 'L9999999999999999.000') FROM INT8_TBL;
SELECT '' AS to_char_14, to_char(q2, 'FM9999999999999999.999') FROM INT8_TBL;
SELECT '' AS to_char_15, to_char(q2, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9') FROM INT8_TBL;
--- src/test/regress/sql/numeric.sql.orig
+++ src/test/regress/sql/numeric.sql
@@ -773,6 +773,7 @@ SELECT '' AS to_char_12, to_char(val, 'F
SELECT '' AS to_char_13, to_char(val, 'FM9999999999990999.990999999999999') FROM num_data;
SELECT '' AS to_char_14, to_char(val, 'FM0999999999999999.999909999999999') FROM num_data;
SELECT '' AS to_char_15, to_char(val, 'FM9999999990999999.099999999999999') FROM num_data;
+SET LC_MONETARY='C';
SELECT '' AS to_char_16, to_char(val, 'L9999999999999999.099999999999999') FROM num_data;
SELECT '' AS to_char_17, to_char(val, 'FM9999999999999999.99999999999999') FROM num_data;
SELECT '' AS to_char_18, to_char(val, 'S 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 . 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9 9') FROM num_data;

10
postgresql13.changes
View File

@ -1,3 +1,13 @@
-------------------------------------------------------------------
Mon Sep 27 13:58:17 UTC 2021 - Reinhard Max <max@suse.com>
- Stop building the mini and lib packages as they are now coming
from postgresql14.
- Let genlists skip non-existing binaries to avoid lots of version
conditionals in the file lists.
- Remove postgresql-testsuite-int8.sql.patch, because its purpose
is unclear. This affects only the test subpackage.
-------------------------------------------------------------------
Tue Aug 31 11:14:53 UTC 2021 - Reinhard Max <max@suse.com>

24
postgresql13.spec
View File

@ -19,7 +19,7 @@
%define pgversion 13.4
%define pgmajor 13
%define pgsuffix %pgmajor
%define buildlibs 1
%define buildlibs 0
%define tarversion %{pgversion}
### CUT HERE ###
@ -142,7 +142,6 @@ Source17: postgresql-rpmlintrc
Patch1: postgresql-conf.patch
# PL/Perl needs to be linked with rpath (bsc#578053)
Patch4: postgresql-plperl-keep-rpath.patch
Patch6: postgresql-testsuite-int8.sql.patch
Patch8: postgresql-testsuite-keep-results-file.patch
Patch9: postgresql-var-run-socket.patch
%if %{with llvm}
@ -452,7 +451,6 @@ included in the postgresql-server package.
touch -r configure tmp
%patch1
%patch4
%patch6
%patch8 -p1
%patch9
%if %{with llvm}
@ -554,7 +552,7 @@ install -sm 0755 src/test/regress/{pg_regress,regress.so} %buildroot%pgtestdir/r
for i in src/test/regress/{data,expected,input,output,sql}; do
cp -r $i %buildroot%pgtestdir/regress/
done
install -m 0644 src/test/regress/{serial,parallel}_schedule %buildroot%pgtestdir/regress
install -m 0644 src/test/regress/*_schedule %buildroot%pgtestdir/regress
# }}}
%endif
@ -605,6 +603,9 @@ genlists ()
PGBIN=%pgbindir/$f
MAN=%pgmandir/man1/$f.1*
# Package only binaries that exist in this version
test -e %buildroot$PGBIN || continue
touch %buildroot$ALTBIN
ln -s $ALTBIN %buildroot$BIN
@ -633,22 +634,13 @@ genlists main \
pg_basebackup \
pg_isready \
pg_recvlogical \
%if %pgsuffix >= 90
createlang \
droplang \
pg_receivexlog \
%else
pg_receivewal \
%if %pgsuffix == 11
pg_verify_checksums \
%endif
%if %pgsuffix >= 12
pg_checksums \
%endif
%if %pgsuffix >= 13
pg_verifybackup
%endif
%endif
%find_lang plpgsql-$VLANG main.files
%find_lang pgscripts-$VLANG main.files
@ -657,21 +649,17 @@ genlists server \
initdb \
pg_ctl \
pg_controldata \
%if %pgsuffix < 90
pg_resetwal \
pg_waldump \
%else
pg_resetxlog \
%endif
postgres \
postmaster
genlists contrib \
%if %pgsuffix > 90
pg_xlogdump \
%endif
oid2name \
pg_archivecleanup \
pg_amcheck \
pg_standby \
pg_test_fsync \
pg_upgrade \