From cfd3e1a13c07eb76ea511c1b77f212794ac5adbe Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Mon, 4 Jul 2016 22:02:13 +0200 Subject: [PATCH] contrib/rpm: improve detection of ppp_version from spec file https://bugzilla.redhat.com/show_bug.cgi?id=1334913 --- 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 914faf4a72..1d74eb28c7 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 glib2_version 2.32.0 %global wireless_tools_version 1:28-0pre9 %global libnl3_version 3.2.7 -%global ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) +%global ppp_version %(sed -n 's/^#define\\s*VERSION\\s*"\\([^\\s]*\\)"$/\\1/p' %{_includedir}/pppd/patchlevel.h 2>/dev/null | grep . || echo bad) %global snapshot %{nil} %global git_sha __COMMIT__