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

contrib/rpm: always drag in bluez-libs-devel

Browse Source 
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.
This commit is contained in:
Lubomir Rintel
2015-07-09 17:16:38 +02:00
parent f44ac46485
commit db44539912
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -146,7 +146,7 @@ BuildRequires: libuuid-devel
BuildRequires: libgudev1-devel >= 143 BuildRequires: libgudev1-devel >= 143
BuildRequires: vala-tools BuildRequires: vala-tools
BuildRequires: iptables BuildRequires: iptables
%if 0%{?with_bluetooth} && 0%{?fedora} > 19 %if 0%{?with_bluetooth}
BuildRequires: bluez-libs-devel BuildRequires: bluez-libs-devel
%endif %endif
%if 0%{?with_wimax} %if 0%{?with_wimax}
@@ -195,11 +195,7 @@ Summary: Bluetooth device plugin for NetworkManager
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: NetworkManager-wwan Requires: NetworkManager-wwan
%if (0%{?fedora} > 19)
Requires: bluez >= 5.0
%else
Requires: bluez >= 4.101-5 Requires: bluez >= 4.101-5
%endif
Obsoletes: NetworkManager < %{obsoletes_nmver} Obsoletes: NetworkManager < %{obsoletes_nmver}
Obsoletes: NetworkManager-bt Obsoletes: NetworkManager-bt