From db445399125318fa86118f9d77cb76d55e64a91b Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Thu, 9 Jul 2015 17:16:38 +0200 Subject: [PATCH] contrib/rpm: always drag in bluez-libs-devel We don't really know which version it's going to be -- and thus if we're going to actually need it (version 5), or not (version 4). It's going to be decided at configure time. Also, drop the bogus Fedora 19 conditionals; Fedora < 20 has ModemManager that's too old for the WWAN code anyway. --- contrib/fedora/rpm/NetworkManager.spec | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 97621d6fd5..5211045801 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -146,7 +146,7 @@ BuildRequires: libuuid-devel BuildRequires: libgudev1-devel >= 143 BuildRequires: vala-tools BuildRequires: iptables -%if 0%{?with_bluetooth} && 0%{?fedora} > 19 +%if 0%{?with_bluetooth} BuildRequires: bluez-libs-devel %endif %if 0%{?with_wimax} @@ -195,11 +195,7 @@ Summary: Bluetooth device plugin for NetworkManager Group: System Environment/Base Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: NetworkManager-wwan -%if (0%{?fedora} > 19) -Requires: bluez >= 5.0 -%else Requires: bluez >= 4.101-5 -%endif Obsoletes: NetworkManager < %{obsoletes_nmver} Obsoletes: NetworkManager-bt