commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-11-03 15:59:39 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.3463 (New) Package is "postgresql12" Tue Nov 3 15:59:39 2020 rev:8 rq:845766 version:12.4 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-10-24 15:16:14.472160332 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.3463/postgresql12.changes 2020-11-03 15:59:40.710392121 +0100 @@ -1,0 +2,6 @@ +Tue Nov 3 13:54:38 UTC 2020 - Reinhard Max + +- Fix a DST problem in the test suite: postgresql-timetz.patch + https://postgr.es/m/16689-57701daa23b37...@postgresql.org + +--- New: postgresql-timetz.patch Other differences: -- ++ postgresql12.spec ++ --- /var/tmp/diff_new_pack.eZUiPS/_old 2020-11-03 15:59:41.594392942 +0100 +++ /var/tmp/diff_new_pack.eZUiPS/_new 2020-11-03 15:59:41.598392946 +0100 @@ -141,6 +141,7 @@ Patch6: postgresql-testsuite-int8.sql.patch Patch8: postgresql-testsuite-keep-results-file.patch Patch9: postgresql-var-run-socket.patch +Patch10:postgresql-timetz.patch URL:https://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql = %version-%release @@ -448,6 +449,7 @@ %patch6 %patch8 -p1 %patch9 +%patch10 touch -r tmp configure rm tmp find src/test/ -name '*.orig' -delete ++ postgresql-timetz.patch ++ From: Tom Lane Date: Thu, 29 Oct 2020 19:28:14 + (-0400) Subject: Stabilize timetz test across DST transitions. X-Git-Url: http://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff_plain;h=4a071afbd056282746a5bc9362e87f579a56402d;hp=f90149e6285aaae6b48559afce1bd638ee26c33e Stabilize timetz test across DST transitions. The timetz test cases I added in commit a9632830b were unintentionally sensitive to whether or not DST is active in the PST8PDT time zone. Thus, they'll start failing this coming weekend, as reported by Bernhard M. Wiedemann in bug #16689. Fortunately, DST-awareness is not significant to the purpose of these test cases, so we can just force them all to PDT (DST hours) to preserve stability of the results. Back-patch to v10, as the prior patch was. Discussion: https://postgr.es/m/16689-57701daa23b37...@postgresql.org --- --- src/test/regress/expected/timetz.out.orig +++ src/test/regress/expected/timetz.out @@ -91,45 +91,45 @@ SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE (12 rows) -- Check edge cases -SELECT '23:59:59.99'::timetz; +SELECT '23:59:59.99 PDT'::timetz; timetz 23:59:59.99-07 (1 row) -SELECT '23:59:59.999'::timetz; -- rounds up +SELECT '23:59:59.999 PDT'::timetz; -- rounds up timetz - 24:00:00-07 (1 row) -SELECT '23:59:60'::timetz; -- rounds up +SELECT '23:59:60 PDT'::timetz; -- rounds up timetz - 24:00:00-07 (1 row) -SELECT '24:00:00'::timetz; -- allowed +SELECT '24:00:00 PDT'::timetz; -- allowed timetz - 24:00:00-07 (1 row) -SELECT '24:00:00.01'::timetz; -- not allowed -ERROR: date/time field value out of range: "24:00:00.01" -LINE 1: SELECT '24:00:00.01'::timetz; +SELECT '24:00:00.01 PDT'::timetz; -- not allowed +ERROR: date/time field value out of range: "24:00:00.01 PDT" +LINE 1: SELECT '24:00:00.01 PDT'::timetz; ^ -SELECT '23:59:60.01'::timetz; -- not allowed -ERROR: date/time field value out of range: "23:59:60.01" -LINE 1: SELECT '23:59:60.01'::timetz; +SELECT '23:59:60.01 PDT'::timetz; -- not allowed +ERROR: date/time field value out of range: "23:59:60.01 PDT" +LINE 1: SELECT '23:59:60.01 PDT'::timetz; ^ -SELECT '24:01:00'::timetz; -- not allowed -ERROR: date/time field value out of range: "24:01:00" -LINE 1: SELECT '24:01:00'::timetz; +SELECT '24:01:00 PDT'::timetz; -- not allowed +ERROR: date/time field value out of range: "24:01:00 PDT" +LINE 1: SELECT '24:01:00 PDT'::timetz; ^ -SELECT '25:00:00'::timetz; -- not allowed -ERROR: date/time field value out of range: "25:00:00" -LINE 1: SELECT '25:00:00'::timetz; +SELECT '25:00:00 PDT'::timetz; -- not allowed +ERROR: date/time field value out of range: "25:00:00 PDT" +LINE 1: SELECT '25:00:00 PDT'::timetz; ^ -- -- TIME simple math --- src/test/regress/sql/timetz.sql.orig +++ src/test/regress/sql/timetz.sql @@ -36,14 +36,14 @@ SELECT f1 AS "None" FROM TIMETZ_TBL WHER SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07'; -- Check edge cases -SELECT '2
commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-10-24 15:16:06 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.3463 (New) Package is "postgresql12" Sat Oct 24 15:16:06 2020 rev:7 rq:843220 version:12.4 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-08-15 21:14:36.339426582 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.3463/postgresql12.changes 2020-10-24 15:16:14.472160332 +0200 @@ -1,0 +2,6 @@ +Fri Sep 25 07:34:28 UTC 2020 - Reinhard Max + +- Stop building the mini and lib packages as they are now coming + from postgresql13. + +--- Old: _multibuild Other differences: -- ++ postgresql12.spec ++ --- /var/tmp/diff_new_pack.PgkSmk/_old 2020-10-24 15:16:15.188161011 +0200 +++ /var/tmp/diff_new_pack.PgkSmk/_new 2020-10-24 15:16:15.192161015 +0200 @@ -19,7 +19,7 @@ %define pgversion 12.4 %define pgmajor 12 %define pgsuffix %pgmajor -%define buildlibs 1 +%define buildlibs 0 %define tarversion %{pgversion} ### CUT HERE ###
commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-08-15 21:14:03 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.3399 (New) Package is "postgresql12" Sat Aug 15 21:14:03 2020 rev:6 rq:826609 version:12.4 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-06-11 09:58:03.421877868 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.3399/postgresql12.changes 2020-08-15 21:14:36.339426582 +0200 @@ -1,0 +2,19 @@ +Thu Aug 13 12:01:34 UTC 2020 - Reinhard Max + +- update to 12.4: + * CVE-2020-14349, bsc#1175193: Set a secure search_path in +logical replication walsenders and apply workers + * CVE-2020-14350, bsc#1175194: Make contrib modules' installation +scripts more secure. + * https://www.postgresql.org/docs/12/release-12-4.html +- Remove postgresql-regress.patch, it does not apply anymore and + it does not seem to be needed anymore. +- Pack the /usr/lib/postgresql symlink only into the main package. + +--- +Tue Jun 16 12:21:43 UTC 2020 - Reinhard Max + +- Let postgresqlXX conflict with postgresql-noarch < 12.0.1 to get + a clean and complete cutover to the new packaging schema. + +--- Old: postgresql-12.3.tar.bz2 postgresql-12.3.tar.bz2.sha256 postgresql-regress.patch New: postgresql-12.4.tar.bz2 postgresql-12.4.tar.bz2.sha256 Other differences: -- ++ postgresql12.spec ++ --- /var/tmp/diff_new_pack.itCmAj/_old 2020-08-15 21:14:39.715428471 +0200 +++ /var/tmp/diff_new_pack.itCmAj/_new 2020-08-15 21:14:39.719428474 +0200 @@ -16,7 +16,7 @@ # -%define pgversion 12.3 +%define pgversion 12.4 %define pgmajor 12 %define pgsuffix %pgmajor %define buildlibs 1 @@ -136,7 +136,6 @@ Source3:postgresql-README.SUSE Source17: postgresql-rpmlintrc Patch1: postgresql-conf.patch -Patch2: postgresql-regress.patch # PL/Perl needs to be linked with rpath (bsc#578053) Patch4: postgresql-plperl-keep-rpath.patch Patch6: postgresql-testsuite-int8.sql.patch @@ -149,6 +148,9 @@ Requires: %libpq >= %version Requires(post): postgresql-noarch >= %pgmajor Requires(postun): postgresql-noarch >= %pgmajor +# At this point we changed the package layout on SLE and conflict with +# older releases to get a clean cut. +Conflicts: postgresql-noarch < 12.0.1 %description PostgreSQL is an advanced object-relational database management system @@ -442,7 +444,6 @@ # confuse PostgreSQL's build system touch -r configure tmp %patch1 -%patch2 %patch4 %patch6 %patch8 -p1 @@ -839,7 +840,6 @@ %pgdocdir/extension %dir %pgdatadir %dir %pgcontribdir -/usr/lib/postgresql %files server -f server.files %defattr(-,root,root) @@ -854,7 +854,6 @@ %pgdatadir/tsearch_data %exclude %pgdatadir/tsearch_data/*.rules %dir %pgdatadir -/usr/lib/postgresql %pgdatadir/timezone* %pgdatadir/*.* %if %buildlibs @@ -874,6 +873,7 @@ %if %{with llvm} %files llvmjit +%defattr(-,root,root) %pglibdir/llvm* %pglibdir/bitcode/* %endif ++ postgresql-12.3.tar.bz2 -> postgresql-12.4.tar.bz2 ++ /work/SRC/openSUSE:Factory/postgresql12/postgresql-12.3.tar.bz2 /work/SRC/openSUSE:Factory/.postgresql12.new.3399/postgresql-12.4.tar.bz2 differ: char 11, line 1 ++ postgresql-12.3.tar.bz2.sha256 -> postgresql-12.4.tar.bz2.sha256 ++ --- /work/SRC/openSUSE:Factory/postgresql12/postgresql-12.3.tar.bz2.sha256 2020-06-11 09:58:03.105876852 +0200 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.3399/postgresql-12.4.tar.bz2.sha256 2020-08-15 21:14:34.347425468 +0200 @@ -1 +1 @@ -94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41 postgresql-12.3.tar.bz2 +bee93fbe2c32f59419cb162bcc0145c58da9a8644ee154a30b9a5ce47de606cc postgresql-12.4.tar.bz2
commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-06-11 09:57:58 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.3606 (New) Package is "postgresql12" Thu Jun 11 09:57:58 2020 rev:5 rq:812779 version:12.3 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-02-29 21:23:33.862403684 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.3606/postgresql12.changes 2020-06-11 09:58:03.421877868 +0200 @@ -1,0 +2,26 @@ +Wed Jun 3 17:36:27 UTC 2020 - Reinhard Max + +- update to 12.3 (bsc#1171924). + https://www.postgresql.org/about/news/2038/ + https://www.postgresql.org/docs/12/release-12-3.html +- Unify the spec file to work across all current PostgreSQL + versions to simplify future maintenance. +- Move from the "libs" build flavour to a "mini" package that will + only be used inside the build service and not get shipped, to + avoid confusion with the debuginfo packages (bsc#1148643). + +--- +Fri May 15 10:13:58 UTC 2020 - Namor Barcode + +- update to 12.3 + https://www.postgresql.org/about/news/2038/ + https://www.postgresql.org/docs/12/release-12-3.html + +--- +Tue Mar 31 14:23:52 UTC 2020 - Reinhard Max + +- Temporarily disable JIT support on SLE until support status of + clang has been clarified. +- We only need clang for LLVM, not clang-devel. + +--- Old: postgresql-12.2.tar.bz2 postgresql-12.2.tar.bz2.sha256 New: postgresql-12.3.tar.bz2 postgresql-12.3.tar.bz2.sha256 Other differences: -- ++ postgresql12.spec ++ 681 lines (skipped) between /work/SRC/openSUSE:Factory/postgresql12/postgresql12.spec and /work/SRC/openSUSE:Factory/.postgresql12.new.3606/postgresql12.spec ++ _multibuild ++ --- /var/tmp/diff_new_pack.njr5YV/_old 2020-06-11 09:58:04.049879886 +0200 +++ /var/tmp/diff_new_pack.njr5YV/_new 2020-06-11 09:58:04.049879886 +0200 @@ -1,3 +1,3 @@ - libs + mini ++ postgresql-12.2.tar.bz2 -> postgresql-12.3.tar.bz2 ++ /work/SRC/openSUSE:Factory/postgresql12/postgresql-12.2.tar.bz2 /work/SRC/openSUSE:Factory/.postgresql12.new.3606/postgresql-12.3.tar.bz2 differ: char 11, line 1 ++ postgresql-12.2.tar.bz2.sha256 -> postgresql-12.3.tar.bz2.sha256 ++ --- /work/SRC/openSUSE:Factory/postgresql12/postgresql-12.2.tar.bz2.sha256 2020-02-19 12:40:20.907602443 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.3606/postgresql-12.3.tar.bz2.sha256 2020-06-11 09:58:03.105876852 +0200 @@ -1 +1 @@ -ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de postgresql-12.2.tar.bz2 +94ed64a6179048190695c86ec707cc25d016056ce10fc9d229267d9a8f1dcf41 postgresql-12.3.tar.bz2 ++ postgresql-rpmlintrc ++ --- /var/tmp/diff_new_pack.njr5YV/_old 2020-06-11 09:58:04.137880169 +0200 +++ /var/tmp/diff_new_pack.njr5YV/_new 2020-06-11 09:58:04.137880169 +0200 @@ -5,3 +5,4 @@ addFilter("file-not-in-%lang") addFilter("no-dependency-on") addFilter("no-soname") +addFilter("devel-file-in-non-devel-package") ++ postgresql-testsuite-int8.sql.patch ++ --- /var/tmp/diff_new_pack.njr5YV/_old 2020-06-11 09:58:04.145880195 +0200 +++ /var/tmp/diff_new_pack.njr5YV/_new 2020-06-11 09:58:04.145880195 +0200 @@ -4,10 +4,8 @@ + SET LC_ -Index: postgresql-11beta1/src/test/regress/expected/int8.out -=== postgresql-11beta1.orig/src/test/regress/expected/int8.out -+++ postgresql-11beta1/src/test/regress/expected/int8.out +--- 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) @@ -16,10 +14,8 @@ SELECT '' AS to_char_13, to_char(q2, 'L.000') FROM INT8_TBL; to_char_13 |to_char + -Index: postgresql-11beta1/src/test/regress/expected/numeric.out -=== postgresql-11beta1.orig/src/test/regress/expected/numeric.out -+++ postgresql-11beta1/src/test/regress/expected/numeric.out +--- 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) @@ -28,10 +24,8 @@ SELECT '' AS to_char_16, to_char(val, 'L.099') FROM n
commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-02-29 21:23:28 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.26092 (New) Package is "postgresql12" Sat Feb 29 21:23:28 2020 rev:4 rq:779839 version:12.2 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-02-19 12:40:20.927602481 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.26092/postgresql12.changes 2020-02-29 21:23:33.862403684 +0100 @@ -1,0 +2,5 @@ +Thu Feb 27 08:58:37 UTC 2020 - Reinhard Max + +- Fix a few mistakes in the spec file. + +--- Old: series Other differences: -- ++ postgresql12.spec ++ --- /var/tmp/diff_new_pack.qBLBNS/_old 2020-02-29 21:23:34.858405654 +0100 +++ /var/tmp/diff_new_pack.qBLBNS/_new 2020-02-29 21:23:34.870405678 +0100 @@ -123,7 +123,6 @@ Source2:baselibs.conf Source3:postgresql-README.SUSE Source17: postgresql-rpmlintrc -Source18: series Patch1: postgresql-conf.patch Patch2: postgresql-regress.patch # PL/Perl needs to be linked with rpath (bsc#578053) @@ -229,7 +228,9 @@ PreReq: postgresql = %version Requires: glibc-locale Requires: timezone +%if %{with llvm} Recommends: %{name}-llvmjit +%endif Provides: postgresql-server-implementation = %version-%release Requires: %libpq >= %version Requires(pre): postgresql-server-noarch >= %pgmajor @@ -320,6 +321,7 @@ Group: Productivity/Databases/Tools Provides: postgresql-docs-implementation = %version-%release Requires: postgresql-docs-noarch >= %pgmajor +BuildArch: noarch %description docs PostgreSQL is an advanced object-relational database management system
commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-02-19 12:40:11 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.26092 (New) Package is "postgresql12" Wed Feb 19 12:40:11 2020 rev:3 rq:774446 version:12.2 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-02-14 16:30:42.599364412 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.26092/postgresql12.changes 2020-02-19 12:40:20.927602481 +0100 @@ -1,0 +2,13 @@ +Sat Feb 15 03:02:07 UTC 2020 - Marcus Rueckert + +- update to 12.2 (CVE-2020-1720) + https://www.postgresql.org/about/news/2011/ + https://www.postgresql.org/docs/12/release-12-2.html + +--- +Fri Feb 14 07:53:46 UTC 2020 - Guillaume GARDET + +- Disable explicitly armv8 CRC for %arm, as we use some armv8 + workers for armv6/7 builds which is confusing configure script + +--- Old: postgresql-12.1.tar.bz2 postgresql-12.1.tar.bz2.sha256 New: postgresql-12.2.tar.bz2 postgresql-12.2.tar.bz2.sha256 Other differences: -- ++ postgresql12.spec ++ --- /var/tmp/diff_new_pack.BDSrgC/_old 2020-02-19 12:40:22.287605099 +0100 +++ /var/tmp/diff_new_pack.BDSrgC/_new 2020-02-19 12:40:22.291605107 +0100 @@ -115,9 +115,9 @@ Summary:Basic Clients and Utilities for PostgreSQL License:PostgreSQL Group: Productivity/Databases/Tools -Version:12.1 +Version:12.2 Release:0 -%define pkg_version 12.1 +%define pkg_version %{version} Source0: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{pkg_version}.tar.bz2 Source1: https://ftp.postgresql.org/pub/source/v%{version}/postgresql-%{pkg_version}.tar.bz2.sha256 Source2:baselibs.conf @@ -432,6 +432,9 @@ %build %global _lto_cflags %{_lto_cflags} -ffat-lto-objects export PYTHON=python3 +%ifarch %arm +export USE_ARMV8_CRC32C=0 +%endif PACKAGE_TARNAME=%pgname %configure \ --bindir=%pgbindir \ --libdir=%pglibdir \ ++ postgresql-12.1.tar.bz2 -> postgresql-12.2.tar.bz2 ++ /work/SRC/openSUSE:Factory/postgresql12/postgresql-12.1.tar.bz2 /work/SRC/openSUSE:Factory/.postgresql12.new.26092/postgresql-12.2.tar.bz2 differ: char 11, line 1 ++ postgresql-12.1.tar.bz2.sha256 -> postgresql-12.2.tar.bz2.sha256 ++ --- /work/SRC/openSUSE:Factory/postgresql12/postgresql-12.1.tar.bz2.sha256 2020-01-28 10:46:02.056454825 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.26092/postgresql-12.2.tar.bz2.sha256 2020-02-19 12:40:20.907602443 +0100 @@ -1 +1 @@ -a09bf3abbaf6763980d0f8acbb943b7629a8b20073de18d867aecdb7988483ed postgresql-12.1.tar.bz2 +ad1dcc4c4fc500786b745635a9e1eba950195ce20b8913f50345bb7d5369b5de postgresql-12.2.tar.bz2
commit postgresql12 for openSUSE:Factory
Hello community, here is the log from the commit of package postgresql12 for openSUSE:Factory checked in at 2020-02-14 16:30:41 Comparing /work/SRC/openSUSE:Factory/postgresql12 (Old) and /work/SRC/openSUSE:Factory/.postgresql12.new.26092 (New) Package is "postgresql12" Fri Feb 14 16:30:41 2020 rev:2 rq:773397 version:12.1 Changes: --- /work/SRC/openSUSE:Factory/postgresql12/postgresql12.changes 2020-01-28 10:46:03.544455739 +0100 +++ /work/SRC/openSUSE:Factory/.postgresql12.new.26092/postgresql12.changes 2020-02-14 16:30:42.599364412 +0100 @@ -1,0 +2,14 @@ +Tue Feb 11 04:15:40 UTC 2020 - Stefan BrĂ¼ns + +- Avoid the dependency from the devel package to the main package. + devel packages are exclusive, thus ecpg does not require + update-alternatives. + +--- +Thu Feb 6 17:13:41 UTC 2020 - Reinhard Max + +- Remove unused build dependencies from the client libs package: + LVM, icu, selinux, systemd. +- Drop conditionals for suse_version 1110/1120. + +--- Other differences: -- ++ postgresql12.spec ++ --- /var/tmp/diff_new_pack.Bu0xUI/_old 2020-02-14 16:30:43.419364857 +0100 +++ /var/tmp/diff_new_pack.Bu0xUI/_new 2020-02-14 16:30:43.419364857 +0100 @@ -1,7 +1,7 @@ # -# spec file for package postgresql11 +# spec file for package postgresql12 # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2020 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,27 +16,6 @@ # -%if 0%{?suse_version} >= 1300 -%bcond_without systemd -%else -%bcond_with systemd -%endif -%if 0%{?suse_version} >= 1500 -%bcond_without systemd_notify -%bcond_without llvm -%else -%bcond_with systemd_notify -%bcond_with llvm -%endif - -%bcond_without selinux -%bcond_without icu -%ifnarch %arm -%bcond_without check -%else -%bcond_with check -%endif - %define pgmajor 12 %define pgname postgresql%pgmajor %define priority %{pgmajor} @@ -67,6 +46,33 @@ %define builddevel 0 %endif +%if 0%{?suse_version} >= 1300 && %buildmain +%bcond_without systemd +%else +%bcond_with systemd +%endif +%if 0%{?suse_version} >= 1500 && %buildmain +%bcond_without systemd_notify +%bcond_without llvm +%else +%bcond_with systemd_notify +%bcond_with llvm +%endif + +%if %buildmain +%bcond_without selinux +%bcond_without icu +%else +%bcond_with selinux +%bcond_with icu +%endif + +%ifnarch %arm +%bcond_without check +%else +%bcond_with check +%endif + %if %buildmain BuildRequires: docbook_4 BuildRequires: gettext-devel @@ -97,11 +103,7 @@ BuildRequires: openldap2-devel BuildRequires: openssl-devel BuildRequires: pkg-config -%if 0%{?suse_version} == 1110 -BuildRequires: krb5-devel -%else BuildRequires: pkgconfig(krb5) -%endif %if %{with systemd_notify} BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) @@ -129,7 +131,7 @@ Patch6: postgresql-testsuite-int8.sql.patch Patch8: postgresql-testsuite-keep-results-file.patch Patch9: postgresql-var-run-socket.patch -Url:https://www.postgresql.org/ +URL:https://www.postgresql.org/ BuildRoot: %{_tmppath}/%{name}-%{version}-build Provides: postgresql = %version-%release Provides: postgresql-implementation = %version-%release @@ -197,8 +199,6 @@ Provides: postgresql-devel-implementation = %version-%release Requires: %libecpg >= %version Requires: %libpq >= %version -Requires(post): postgresql-noarch >= %pgmajor -Requires(postun): postgresql-noarch >= %pgmajor # Installation of postgresql??-devel is exclusive Provides: postgresql-devel-exclusive = %pgmajor Conflicts: postgresql-devel-exclusive < %pgmajor @@ -268,11 +268,7 @@ Requires: pam-devel Requires: readline-devel Requires: zlib-devel -%if 0%{?suse_version} == 1110 -Requires: krb5-devel -%else Requires: pkgconfig(krb5) -%endif %if %{with selinux} Requires: libselinux-devel %endif @@ -324,9 +320,6 @@ Group: Productivity/Databases/Tools Provides: postgresql-docs-implementation = %version-%release Requires: postgresql-docs-noarch >= %pgmajor -%if 0%{?suse_version} >= 1120 -BuildArch: noarch -%endif %description docs PostgreSQL is an advanced object-relational database management system @@ -619,7 +612,9 @@ popd mkdir -p %buildroot%pgmandir/man1 cp -a doc/src/sgml/man1/ecpg.1 %buildroot%pgmandir/man1/ecpg.1pg%pgmajor -genlists devel ecpg +# No update-alternatives, deve