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

contrib/rpm: drop EOL versions of Fedora

Browse Source 
These are history and noone should be using them; special casing them is
essentially line noise.
This commit is contained in:
Lubomir Rintel
2017-03-02 10:01:41 +01:00
parent ef8c292881
commit d2fd1b9fb7
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -47,18 +47,12 @@
%global default_with_bluetooth 1 %global default_with_bluetooth 1
%global default_with_wwan 1 %global default_with_wwan 1
%if (0%{?fedora} && 0%{?fedora} < 23) %if 0%{?fedora}
%global dbus_version 1.1
%global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
%else
%global dbus_version 1.9.18 %global dbus_version 1.9.18
%global dbus_sys_dir %{_datadir}/dbus-1/system.d %global dbus_sys_dir %{_datadir}/dbus-1/system.d
%endif %else
%global dbus_version 1.1
# ModemManager on Fedora < 20 too old for Bluetooth && wwan %global dbus_sys_dir %{_sysconfdir}/dbus-1/system.d
%if (0%{?fedora} && 0%{?fedora} < 20)
%global default_with_bluetooth 0
%global default_with_wwan 0
%endif %endif
# Bluetooth requires the WWAN plugin # Bluetooth requires the WWAN plugin
@@ -78,12 +72,7 @@
%bcond_with wwan %bcond_with wwan
%endif %endif
%if (0%{?fedora} && 0%{?fedora} <= 19)
%bcond_with team
%else
%bcond_without team %bcond_without team
%endif
%bcond_without wifi %bcond_without wifi
%bcond_without ppp %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 %global with_modem_manager_1 1
%else %else
%global with_modem_manager_1 0 %global with_modem_manager_1 0