From 755759be379d5c395e261798652f97934cc53cbdc0d74041518d778e8c05c232 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Mon, 27 Sep 2021 14:07:11 +0000
Subject: [PATCH] - 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 @@
-<multibuild>
-  <package>mini</package>
-</multibuild>
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 <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.
+
 -------------------------------------------------------------------
 Tue Aug 31 11:14:53 UTC 2021 - Reinhard Max <max@suse.com>
 
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 \