From ca5b2a1156926becb8deeee4db11bbdb9a0f89848bcf99bba67423a456bba5cc Mon Sep 17 00:00:00 2001
From: Reinhard Max <max@suse.com>
Date: Tue, 11 Feb 2020 09:33:54 +0000
Subject: [PATCH] Accepting request 773379 from
 home:StefanBruens:branches:openSUSE:Factory:Staging:I

- Avoid the dependency from the devel package to the main package.
  devel packages are exclusive, thus ecpg does not require
  update-alternatives.

OBS-URL: https://build.opensuse.org/request/show/773379
OBS-URL: https://build.opensuse.org/package/show/server:database:postgresql/postgresql12?expand=0&rev=6
---
 postgresql12.changes |  7 +++++++
 postgresql12.spec    | 18 ++++++------------
 2 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/postgresql12.changes b/postgresql12.changes
index b6103f3..3d9c8ef 100644
--- a/postgresql12.changes
+++ b/postgresql12.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 11 04:15:40 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- 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 <max@suse.com>
 
diff --git a/postgresql12.spec b/postgresql12.spec
index e9c9f84..2e73a8b 100644
--- a/postgresql12.spec
+++ b/postgresql12.spec
@@ -199,8 +199,6 @@ Group:          Development/Libraries/C and C++
 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
@@ -614,7 +612,9 @@ done
 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, devel-packages are exclusive
+ln -s %pgbindir/ecpg %buildroot%_bindir/ecpg
+%find_lang ecpg-%{pgmajor} devel.files
 
 # Build up the file lists for the libpq and libecpg packages
 cat > libpq.files <<EOF
@@ -715,15 +715,6 @@ fi
 /usr/share/postgresql/install-alternatives %priority
 %endif
 
-%if %builddevel
-
-%post -n %pgname-devel
-/usr/share/postgresql/install-alternatives %priority
-
-%postun -n %pgname-devel
-/usr/share/postgresql/install-alternatives %priority
-%endif
-
 %if %buildlibs
 %post -n %libpq -p /sbin/ldconfig
 
@@ -838,9 +829,12 @@ fi
 %defattr(-,root,root)
 %dir %pgbasedir
 %dir %pgbindir
+%_bindir/ecpg
 %_libdir/pkgconfig/*
 %_libdir/lib*.so
+%pgbindir/ecpg
 %pgincludedir
+%doc %pgmandir/man1/ecpg.1*
 
 %endif