colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

contrib/rpm: don't hardwire a single ppp version

Browse Source 
Build against whatever is actually present.

https://bugzilla.gnome.org/show_bug.cgi?id=736954

Signed-off-by: Thomas Haller <thaller@redhat.com>
This commit is contained in:
Lubomir Rintel
2014-09-07 23:36:35 +02:00
committed by Thomas Haller
parent ca2145bef2
commit 53b9504544
1 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
contrib/fedora/rpm/NetworkManager.spec
View File

@@ -14,10 +14,7 @@
%define wireless_tools_version 1:28-0pre9 %define wireless_tools_version 1:28-0pre9
%define libnl3_version 3.2.7 %define libnl3_version 3.2.7
%define ppp_version 2.4.5 %define ppp_version %(pppd --help 2>&1 |awk 'BEGIN {v="bad"} /pppd version/ {v=$NF} END {print v}')
%if (0%{?fedora} && 0%{?fedora} > 20)
%define ppp_version 2.4.6
%endif
%define snapshot %{nil} %define snapshot %{nil}
%define git_sha __COMMIT__ %define git_sha __COMMIT__
@@ -136,8 +133,7 @@ BuildRequires: libnl3-devel >= %{libnl3_version}
BuildRequires: perl(XML::Parser) BuildRequires: perl(XML::Parser)
BuildRequires: perl(YAML) BuildRequires: perl(YAML)
BuildRequires: automake autoconf intltool libtool BuildRequires: automake autoconf intltool libtool
BuildRequires: ppp = %{ppp_version} BuildRequires: ppp-devel >= 2.4.5
BuildRequires: ppp-devel = %{ppp_version}
BuildRequires: nss-devel >= 3.11.7 BuildRequires: nss-devel >= 3.11.7
BuildRequires: dhclient BuildRequires: dhclient
BuildRequires: readline-devel BuildRequires: readline-devel