From 5b65fd9136731267e043007eee4deaada324467f Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Fri, 23 Sep 2016 12:11:16 +0200 Subject: [PATCH] contrib/rpm: require at least the version of glib we built against glib neither versions its symbols nor bumps SONAME on API changes, so rpm can't figure out the correct dependencies itself. https://bugzilla.redhat.com/show_bug.cgi?id=1378809 (cherry picked from commit e59ed6451f0cd0a6f59a7448c89f97081b7ace1e) --- contrib/fedora/rpm/NetworkManager.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index f79697f429..e64d746d25 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -10,11 +10,11 @@ %global dbus_version 1.1 %global dbus_glib_version 0.100 -%global glib2_version 2.32.0 %global wireless_tools_version 1:28-0pre9 %global libnl3_version 3.2.7 %global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) +%global glib2_version %(pkg-config --modversion glib-2.0 2>/dev/null || echo bad) %global snapshot %{nil} %global git_sha __COMMIT__ @@ -139,7 +139,7 @@ BuildRequires: dbus-glib-devel >= %{dbus_glib_version} %if 0%{?fedora} BuildRequires: wireless-tools-devel >= %{wireless_tools_version} %endif -BuildRequires: glib2-devel >= %{glib2_version} +BuildRequires: glib2-devel >= 2.32.0 BuildRequires: gobject-introspection-devel >= 0.10.3 BuildRequires: gettext-devel BuildRequires: pkgconfig