Add explicit conflict between libpq-devel and private-devel

Related: #1984374

postgresql.spec

@@ -63,7 +63,7 @@ Summary: PostgreSQL client programs
 Name: postgresql
 %global majorversion 13
 Version: %{majorversion}.3
-Release: 4%{?dist}
+Release: 5%{?dist}
 
 # The PostgreSQL license is very similar to other MIT licenses, but the OSI
 # recognizes it as an independent license, so we do as well.
@@ -212,6 +212,8 @@ PostgreSQL server, install libpq package instead.
 Summary: PostgreSQL development header files for this build of PostgreSQL server
 Group: Development/Libraries
 Requires: %{name}-private-libs%{?_isa} = %precise_version
+# Conflict is desired here, a user must pick one or another
+Conflicts: libpq-devel
 
 %description private-devel
 The postgresql-private-devel package contains the header files and libraries
@@ -1216,6 +1218,9 @@ make -C postgresql-setup-%{setup_version} check
 
 
 %changelog
+* Wed Jul 22 2021 Filip Januš <fjanus@redhat.com> - 13.3-5
+- Add explicit conflict between private-devel and libpq-devel
+
 * Wed Jul 21 2021 Filip Januš <fjanus@redhat.com> - 13.3-4
 - Fix multilib header files path
   Resolves: #1984374