From 727b17f4521830cee2a89bc88ecc3af2db4669542a64b9cf2c3c8e0373b50688 Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Mon, 27 Sep 2021 14:05:42 +0000
Subject: [PATCH] - 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/postgresql14?expand=0&rev=2
---
 postgresql14.changes |  6 ++++++
 postgresql14.spec    | 25 +++++--------------------
 2 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/postgresql14.changes b/postgresql14.changes
index 6d88e70..b82417a 100644
--- a/postgresql14.changes
+++ b/postgresql14.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Sep 27 14:04:01 UTC 2021 - Reinhard Max <max@suse.com>
+
+- Let genlists skip non-existing binaries to avoid lots of version
+  conditionals in the file lists.
+
 -------------------------------------------------------------------
 Sat Sep 25 00:34:52 UTC 2021 - Marcus Rueckert <mrueckert@suse.de>
 
diff --git a/postgresql14.spec b/postgresql14.spec
index 89e126a..a3f3865 100644
--- a/postgresql14.spec
+++ b/postgresql14.spec
@@ -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/{standby,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,27 +651,18 @@ 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 \
-%if %pgsuffix < 14 || %pgsuffix > 90
-	pg_standby \
-%endif
-%if %pgsuffix >= 14
 	pg_amcheck \
-%endif
+	pg_standby \
 	pg_test_fsync \
 	pg_upgrade \
         pgbench \