From 755759be379d5c395e261798652f97934cc53cbdc0d74041518d778e8c05c232 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Mon, 27 Sep 2021 14:07:11 +0000 Subject: [PATCH 1/4] - 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. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=38 --- _multibuild | 3 --- postgresql13.changes | 8 ++++++++ postgresql13.spec | 21 +++++---------------- 3 files changed, 13 insertions(+), 19 deletions(-) delete mode 100644 _multibuild 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/postgresql13.changes b/postgresql13.changes index 61a2430..413f81b 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Mon Sep 27 13:58:17 UTC 2021 - Reinhard Max + +- 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. + ------------------------------------------------------------------- Tue Aug 31 11:14:53 UTC 2021 - Reinhard Max diff --git a/postgresql13.spec b/postgresql13.spec index 99cde3c..6bf2a1e 100644 --- a/postgresql13.spec +++ b/postgresql13.spec @@ -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 ### @@ -554,7 +554,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 +605,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 +636,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,19 +651,14 @@ 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_standby \ From 1b8b7fdba8802de513ccbc76985ec0814e1249bcd432809badab42464b7abb08 Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 5 Oct 2021 11:16:03 +0000 Subject: [PATCH 2/4] - Simplify file list generation. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=39 --- postgresql13.changes | 5 +++++ postgresql13.spec | 1 + 2 files changed, 6 insertions(+) diff --git a/postgresql13.changes b/postgresql13.changes index 413f81b..e9e2d26 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Oct 5 11:14:27 UTC 2021 - Reinhard Max + +- Simplify file list generation. + ------------------------------------------------------------------- Mon Sep 27 13:58:17 UTC 2021 - Reinhard Max diff --git a/postgresql13.spec b/postgresql13.spec index 6bf2a1e..5d71a5a 100644 --- a/postgresql13.spec +++ b/postgresql13.spec @@ -661,6 +661,7 @@ genlists contrib \ pg_xlogdump \ oid2name \ pg_archivecleanup \ + pg_amcheck \ pg_standby \ pg_test_fsync \ pg_upgrade \ From c5a36ee1e0a9fdbfdc599c12acbea7c6feb7fdca75c071e8f5ac8ff83b2b319f Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Tue, 5 Oct 2021 11:44:09 +0000 Subject: [PATCH 3/4] OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=40 --- postgresql-testsuite-int8.sql.patch | 46 ----------------------------- postgresql13.changes | 5 ---- postgresql13.spec | 2 -- 3 files changed, 53 deletions(-) delete mode 100644 postgresql-testsuite-int8.sql.patch diff --git a/postgresql-testsuite-int8.sql.patch b/postgresql-testsuite-int8.sql.patch deleted file mode 100644 index 53f10de..0000000 --- a/postgresql-testsuite-int8.sql.patch +++ /dev/null @@ -1,46 +0,0 @@ -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; diff --git a/postgresql13.changes b/postgresql13.changes index e9e2d26..413f81b 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -1,8 +1,3 @@ -------------------------------------------------------------------- -Tue Oct 5 11:14:27 UTC 2021 - Reinhard Max - -- Simplify file list generation. - ------------------------------------------------------------------- Mon Sep 27 13:58:17 UTC 2021 - Reinhard Max diff --git a/postgresql13.spec b/postgresql13.spec index 5d71a5a..9c0fad5 100644 --- a/postgresql13.spec +++ b/postgresql13.spec @@ -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} From 1d2ea82175227663841512be015d594ca7579cda9be565b12c55b73a8a041b4e Mon Sep 17 00:00:00 2001 From: Reinhard Max Date: Wed, 6 Oct 2021 14:15:37 +0000 Subject: [PATCH 4/4] - Remove postgresql-testsuite-int8.sql.patch, because its purpose is unclear. This affects only the test subpackage. OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql13?expand=0&rev=41 --- postgresql13.changes | 2 ++ 1 file changed, 2 insertions(+) diff --git a/postgresql13.changes b/postgresql13.changes index 413f81b..9549797 100644 --- a/postgresql13.changes +++ b/postgresql13.changes @@ -5,6 +5,8 @@ Mon Sep 27 13:58:17 UTC 2021 - Reinhard Max 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