summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLubomir Rintel <lkundrak@v3.sk>2016-09-23 12:11:16 +0200
committerLubomir Rintel <lkundrak@v3.sk>2016-09-23 12:20:23 +0200
commite59ed6451f0cd0a6f59a7448c89f97081b7ace1e (patch)
treebe1de3996a7d1c3e43fb5df18762de57a10b6630
parent36f561ead0191a914589fed284a05a9b3192293d (diff)
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
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec4
1 files 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