From 95252ef9a6c8c679ea57683b16ac94e8addddee127fbd8c90076f60aa0ddd919 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 5 Oct 2021 11:26:17 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql14?expand=0&rev=4 --- postgresql-testsuite-int8.sql.patch | 47 +---------------------------- postgresql14.changes | 6 ++++ postgresql14.spec | 4 +-- 3 files changed, 9 insertions(+), 48 deletions(-) diff --git a/postgresql-testsuite-int8.sql.patch b/postgresql-testsuite-int8.sql.patch index 53f10de..c5f0a64 100644 --- a/postgresql-testsuite-int8.sql.patch +++ b/postgresql-testsuite-int8.sql.patch @@ -1,46 +1 @@ -commit a210bee6273041cf9773383e2dda58a7d7c84be4 -Author: yac -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; +# This patch only exists on PostgreSQL 13 and earlier diff --git a/postgresql14.changes b/postgresql14.changes index 3baad0f..f72e16c 100644 --- a/postgresql14.changes +++ b/postgresql14.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Oct 5 11:16:30 UTC 2021 - Reinhard Max + +- Let genlists skip non-existing binaries to avoid lots of version + conditionals in the file lists. + ------------------------------------------------------------------- Thu Sep 30 17:28:37 UTC 2021 - Marcus Rueckert diff --git a/postgresql14.spec b/postgresql14.spec index 29f8df9..f5c1ad5 100644 --- a/postgresql14.spec +++ b/postgresql14.spec @@ -20,7 +20,7 @@ %define pgmajor 14 %define pgsuffix %pgmajor %define buildlibs 1 -%define tarversion 14.0 +%define tarversion %{pgversion} ### CUT HERE ### %define pgname postgresql%pgsuffix @@ -452,7 +452,7 @@ included in the postgresql-server package. touch -r configure tmp %patch1 %patch4 -#patch6 +%patch6 %patch8 -p1 %patch9 %if %{with llvm}