From 1a20e3016b6bc4c8b3ea2a13a785ca2f7bb29fdee5ef792a7c27e672ead41f82 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 10 Oct 2023 13:13:29 +0000
Subject: [PATCH 1/2] - boo#1216022: Call install-alternatives from the devel
 subpackage   as well, otherwise the symlink for ecpg might be missing.

- Also buildignore the postgresql*-implementation symbols: this is
  needed in order to bootstrap when no postgresql version currently
  has valid symbols provided. Once the packages are built, OBS
  could translate this to the pgname-* packages and accept the
  ignores; during bootstrap though, there is nothing providing the
  symbol and the existing buildignores do not suffice.

OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=88
---
 postgresql12.changes | 17 +++++++++++++++++
 postgresql12.spec    | 20 +++++++++++++-------
 2 files changed, 30 insertions(+), 7 deletions(-)

diff --git a/postgresql12.changes b/postgresql12.changes
index 3ba13a4..62ad9c6 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,20 @@
+-------------------------------------------------------------------
+Tue Oct 10 12:49:02 UTC 2023 - Reinhard Max <max@suse.com>
+
+- boo#1216022: Call install-alternatives from the devel subpackage
+  as well, otherwise the symlink for ecpg might be missing.
+
+-------------------------------------------------------------------
+Mon Sep 18 15:24:14 UTC 2023 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Also buildignore the postgresql*-implementation symbols: this is
+  needed in order to bootstrap when no postgresql version currently
+  has valid symbols provided. Once the packages are built, OBS
+  could translate this to the pgname-* packages and accept the
+  ignores; during bootstrap though, there is nothing providing the
+  symbol and the existing buildignores do not suffice.
+
+-------------------------------------------------------------------
 Wed Aug  9 10:25:49 UTC 2023 - Reinhard Max <max@suse.com>
 
 - Update to 12.16:
diff --git a/postgresql12.spec b/postgresql12.spec
index 3a5942a..204c758 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -159,6 +159,10 @@ BuildRequires:  pkgconfig(systemd)
 #!BuildIgnore:  %pgname-pltcl
 #!BuildIgnore:  %pgname-plperl
 #!BuildIgnore:  %pgname-plpython
+#!BuildIgnore:  postgresql-implementation
+#!BuildIgnore:  postgresql-server-implementation
+#!BuildIgnore:  postgresql-server-devel-implementation
+#!BuildIgnore:  postgresql-llvmjit-devel-implementation
 Summary:        Basic Clients and Utilities for PostgreSQL
 License:        PostgreSQL
 Group:          Productivity/Databases/Tools
@@ -505,7 +509,7 @@ included in the postgresql-server package.
 touch -r configure tmp
 %patch1
 %patch4
-%patch8 -p1
+%patch8
 %patch9
 %if %{with llvm}
 %patch10
@@ -791,18 +795,20 @@ awk -v P=%buildroot '/^(%lang|[^%])/{print P $NF}' libpq.files libecpg.files | x
 
 %post -n %pgname-%devel
 /sbin/ldconfig
-%if %{with server_devel}
-%post server-devel
-%endif
 /usr/share/postgresql/install-alternatives %pgmajor
 
 %postun -n %pgname-%devel
 /sbin/ldconfig
-%if %{with server_devel}
-%postun server-devel
-%endif
 /usr/share/postgresql/install-alternatives %pgmajor
 
+%if %{with server_devel}
+%post server-devel
+/usr/share/postgresql/install-alternatives %pgmajor
+
+%postun server-devel
+/usr/share/postgresql/install-alternatives %pgmajor
+%endif
+
 %if !%mini
 
 %postun

From 70f264061cfa84c1600c782df6db74da9993c2c93ed363e2111fc59b59e6d830 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 10 Oct 2023 14:54:09 +0000
Subject: [PATCH 2/2] OBS-URL:
 https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=89

---
 postgresql-testsuite-keep-results-file.patch | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/postgresql-testsuite-keep-results-file.patch b/postgresql-testsuite-keep-results-file.patch
index 0cfcec3..443fcef 100644
--- a/postgresql-testsuite-keep-results-file.patch
+++ b/postgresql-testsuite-keep-results-file.patch
@@ -4,11 +4,9 @@ Date:   Mon Mar 11 18:42:39 2013 +0100
 
     don't unlink the result file
 
-Index: postgresql-12beta2/src/test/regress/pg_regress.c
-===================================================================
---- postgresql-12beta2.orig/src/test/regress/pg_regress.c
-+++ postgresql-12beta2/src/test/regress/pg_regress.c
-@@ -2597,7 +2597,6 @@ regression_main(int argc, char *argv[],
+--- src/test/regress/pg_regress.c.orig
++++ src/test/regress/pg_regress.c
+@@ -2645,7 +2645,6 @@ regression_main(int argc, char *argv[],
  	else
  	{
  		unlink(difffilename);