diff options
| author | Thomas Haller <thaller@redhat.com> | 2014-10-03 12:07:10 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-03 12:49:19 +0200 |
| commit | a64de150c3dc43acd49988922823784aec7068d7 (patch) | |
| tree | eaad56ea510ef79290bcc23ad458d5a0ad3b317a | |
| parent | d4cd8b578596e7698c48eb6be02bcbfd678256b0 (diff) | |
| download | NetworkManager-a64de150c3dc43acd49988922823784aec7068d7.tar.gz | |
contrib/rpm: detect ppp version based on installed package
Also fixes build failure if user had no /sbin/pppd in its $PATH.
https://bugzilla.gnome.org/show_bug.cgi?id=736954
Signed-off-by: Thomas Haller <thaller@redhat.com>
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 00677640e9..6ec39b65d0 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -14,7 +14,7 @@ %define wireless_tools_version 1:28-0pre9 %define libnl3_version 3.2.7 -%define ppp_version %(pppd --help 2>&1 |awk 'BEGIN {v="bad"} /pppd version/ {v=$NF} END {print v}') +%define ppp_version %(rpm -q ppp-devel >/dev/null && rpm -q --qf '%%{version}' ppp-devel || echo -n bad) %define snapshot %{nil} %define git_sha __COMMIT__ |