diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2014-09-07 23:36:35 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2014-10-02 16:31:05 +0200 |
| commit | 53b9504544cbfabb74b97b32ab52f14c7d202d93 (patch) | |
| tree | 7471bacf4c7f72625064d6716dcc31feb4c133df | |
| parent | ca2145bef250927a9fc05049890c8ffe248bd948 (diff) | |
| download | NetworkManager-53b9504544cbfabb74b97b32ab52f14c7d202d93.tar.gz | |
contrib/rpm: don't hardwire a single ppp version
Build against whatever is actually present.
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 | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 8d3bc63bfb..00677640e9 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -14,10 +14,7 @@ %define wireless_tools_version 1:28-0pre9 %define libnl3_version 3.2.7 -%define ppp_version 2.4.5 -%if (0%{?fedora} && 0%{?fedora} > 20) -%define ppp_version 2.4.6 -%endif +%define ppp_version %(pppd --help 2>&1 |awk 'BEGIN {v="bad"} /pppd version/ {v=$NF} END {print v}') %define snapshot %{nil} %define git_sha __COMMIT__ @@ -136,8 +133,7 @@ BuildRequires: libnl3-devel >= %{libnl3_version} BuildRequires: perl(XML::Parser) BuildRequires: perl(YAML) BuildRequires: automake autoconf intltool libtool -BuildRequires: ppp = %{ppp_version} -BuildRequires: ppp-devel = %{ppp_version} +BuildRequires: ppp-devel >= 2.4.5 BuildRequires: nss-devel >= 3.11.7 BuildRequires: dhclient BuildRequires: readline-devel |