diff options
| author | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-02 10:01:41 +0100 |
|---|---|---|
| committer | Lubomir Rintel <lkundrak@v3.sk> | 2017-03-02 15:51:46 +0100 |
| commit | d2fd1b9fb7ef73f3bdeb5c68f1e382c1244a5012 (patch) | |
| tree | c72ca9a708d2343aae47b31007ad87c7bb010161 | |
| parent | ef8c29288149a6b9fa0ff61b83c90860cd76a00f (diff) | |
contrib/rpm: drop EOL versions of Fedora
These are history and noone should be using them; special casing them is
essentially line noise.
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 9ec883b91..a25cc6288 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -47,18 +47,12 @@ %global default_with_bluetooth 1 %global default_with_wwan 1 -%if (0%{?fedora} && 0%{?fedora} < 23) -%global dbus_version 1.1 -%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d -%else +%if 0%{?fedora} %global dbus_version 1.9.18 %global dbus_sys_dir %{_datadir}/dbus-1/system.d -%endif - -# ModemManager on Fedora < 20 too old for Bluetooth && wwan -%if (0%{?fedora} && 0%{?fedora} < 20) -%global default_with_bluetooth 0 -%global default_with_wwan 0 +%else +%global dbus_version 1.1 +%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d %endif # Bluetooth requires the WWAN plugin @@ -78,12 +72,7 @@ %bcond_with wwan %endif -%if (0%{?fedora} && 0%{?fedora} <= 19) -%bcond_with team -%else %bcond_without team -%endif - %bcond_without wifi %bcond_without ppp @@ -94,7 +83,7 @@ ############################################################################### -%if %{with bluetooth} || (%{with wwan} && (0%{?rhel} || (0%{?fedora} && 0%{?fedora} > 19))) +%if %{with bluetooth} || %{with wwan} %global with_modem_manager_1 1 %else %global with_modem_manager_1 0 |