diff options
| author | Thomas Haller <thaller@redhat.com> | 2016-12-16 09:51:45 +0100 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2016-12-16 09:51:48 +0100 |
| commit | f5100d0681b0ec90c5fbe56e92216961d3f891a8 (patch) | |
| tree | 1f9277f41c66f45e999d55852fb39925cf587425 /contrib | |
| parent | 4b6fb82bc57b193253b8264ac7b74d60aec9d582 (diff) | |
| download | NetworkManager-f5100d0681b0ec90c5fbe56e92216961d3f891a8.tar.gz | |
contrib/rpm: fix obsoletes_ppp_plugin version
The ppp package split was introduced during 1.5.3 development. Thus,
we obsolete packages < 1:1.5.3.
Also, add conditionals around ppp-devel build-requirement.
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index bff841d5ec..12d97c37d7 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -25,7 +25,7 @@ %global epoch_version 1 %global obsoletes_device_plugins 1:0.9.9.95-1 -%global obsoletes_ppp_plugin 1:1.5.2 +%global obsoletes_ppp_plugin 1:1.5.3 %global systemd_dir %{_prefix}/lib/systemd/system %global nmlibdir %{_prefix}/lib/%{name} @@ -141,7 +141,9 @@ BuildRequires: gettext-devel BuildRequires: pkgconfig BuildRequires: libnl3-devel >= %{libnl3_version} BuildRequires: automake autoconf intltool libtool +%if %{with ppp} BuildRequires: ppp-devel >= 2.4.5 +%endif BuildRequires: nss-devel >= 3.11.7 BuildRequires: dhclient BuildRequires: readline-devel |