From 8be79cb42a8d42bb30feba9c13491ff34f60e840 Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 25 Sep 2019 11:46:09 +0200 Subject: [PATCH] Don't add pkgconfig provides to python2-gobject-devel This makes sure dnf prefers python3-gobject-devel over python2-gobject-devel when using pkgconfg() BuildRequires in other packages. --- pygobject3.spec | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pygobject3.spec b/pygobject3.spec index db55c07..08a4358 100644 --- a/pygobject3.spec +++ b/pygobject3.spec @@ -6,7 +6,7 @@ Name: pygobject3 Version: 3.34.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Python bindings for GObject Introspection License: LGPLv2+ and MIT @@ -22,6 +22,11 @@ BuildRequires: python2-cairo-devel >= %{pycairo_version} BuildRequires: python3-devel >= %{python3_version} BuildRequires: python3-cairo-devel >= %{pycairo_version} +# Don't use automatic provides in order to prefer python3-gobject-devel over +# python2-gobject-devel. The provides are added to python3-gobject-devel +# manually down below. +%global __provides_exclude_from ^%{_libdir}/pkgconfig/pygobject-3\\.0\\.pc$ + %description The %{name} package provides a convenient wrapper for the GObject library for use in Python programs. @@ -89,6 +94,9 @@ Requires: gobject-introspection-devel%{?_isa} # Renamed in F31 Obsoletes: pygobject3-devel < 3.34.0-2 Provides: pygobject3-devel = %{version}-%{release} +# Manually add pkgconfig provides to the python3-gobject-devel subpackage (but +# not to python2 where they are filtered out) +Provides: pkgconfig(pygobject-3.0) = %{version} %description -n python3-gobject-devel This package contains files required to embed PyGObject @@ -150,6 +158,9 @@ popd %{_libdir}/pkgconfig/pygobject-3.0.pc %changelog +* Wed Sep 25 2019 Kalev Lember - 3.34.0-3 +- Don't add pkgconfig provides to python2-gobject-devel + * Sat Sep 21 2019 Kalev Lember - 3.34.0-2 - Drop Python 3 conditionals - Split pygobject3-devel into python2-gobject-devel and python3-gobject-devel