From db0c99bbedc28519af64c302d37dc1c176669a0c Mon Sep 17 00:00:00 2001 From: Honza Horak Date: Thu, 22 Jul 2021 18:04:55 +0200 Subject: [PATCH] Do not provide pkgconfig(libpq) to not trick packages that actually require libpq-devel Resolves: #1980992 --- postgresql.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/postgresql.spec b/postgresql.spec index d652754..032a227 100644 --- a/postgresql.spec +++ b/postgresql.spec @@ -63,7 +63,7 @@ Summary: PostgreSQL client programs Name: postgresql %global majorversion 13 Version: %{majorversion}.3 -Release: 5%{?dist} +Release: 6%{?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. @@ -181,7 +181,8 @@ BuildRequires: libicu-devel %endif # https://bugzilla.redhat.com/1464368 -%global __provides_exclude_from %{_libdir}/pgsql +# and do not provide pkgconfig RPM provides (RHBZ#1980992) +%global __provides_exclude_from %{_libdir}/(pgsql|pkgconfig) %description PostgreSQL is an advanced Object-Relational database management system (DBMS). @@ -1218,7 +1219,12 @@ make -C postgresql-setup-%{setup_version} check %changelog -* Wed Jul 22 2021 Filip Januš - 13.3-5 +* Thu Jul 22 2021 Honza Horak - 13.3-6 +- Do not provide pkgconfig(libpq) to not trick packages that actually require + libpq-devel + Resolves: #1980992 + +* Thu Jul 22 2021 Filip Januš - 13.3-5 - Add explicit conflict between private-devel and libpq-devel * Wed Jul 21 2021 Filip Januš - 13.3-4