fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-06 03:30:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/rpm: misc specfile updates

Browse source 
Unify the obsoletes so they don't have to be changed every time.

Clarify the WWAN package description, since it really applies to
2G/3G/4G devices, not just 3G.

Also sync the glib and dbus-glib required versions with actual
NetworkManager requirements from configure.ac.
This commit is contained in:
Dan Williams 2014-06-09 10:45:29 -05:00
parent 59c1a58fcf
commit 1963addac6
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
contrib/fedora/rpm/NetworkManager.spec
View file

@ -5,9 +5,9 @@
# other distribution.
%define dbus_version 1.1
%define dbus_glib_version 0.94
%define dbus_glib_version 0.100
%define glib2_version 2.24.0
%define glib2_version 2.32.0
%define wireless_tools_version 1:28-0pre9
%define libnl3_version 3.2.7
%define ppp_version 2.4.5
@ -17,6 +17,8 @@
%define realversion __VERSION__
%define release_version __RELEASE_VERSION__
%define obsoletes_nmver 1:0.9.9.95-1
%global with_nmtui 1
%if 0%{?fedora}
@ -100,7 +102,7 @@ Requires: udev
Requires: iptables
Requires: readline
Obsoletes: dhcdbd
Obsoletes: NetworkManager < 1:0.9.9.1-2
Obsoletes: NetworkManager < %{obsoletes_nmver}
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
@ -165,7 +167,7 @@ services.
Summary: ADSL device plugin for NetworkManager
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: NetworkManager < 1:0.9.9.1-2
Obsoletes: NetworkManager < %{obsoletes_nmver}
Obsoletes: NetworkManager-atm
%description adsl
@ -184,7 +186,7 @@ Requires: bluez >= 5.0
%else
Requires: bluez >= 4.101-5
%endif
Obsoletes: NetworkManager < 1:0.9.9.1-2
Obsoletes: NetworkManager < %{obsoletes_nmver}
Obsoletes: NetworkManager-bt
%description bluetooth
@ -198,7 +200,7 @@ Summary: Wifi plugin for NetworkManager
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: wpa_supplicant >= 1:1.1
Obsoletes: NetworkManager < 1:0.9.9.1-2
Obsoletes: NetworkManager < %{obsoletes_nmver}
%description wifi
This package contains NetworkManager support for Wifi and OLPC devices.
@ -211,10 +213,10 @@ Summary: Mobile broadband device plugin for NetworkManager
Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Requires: ModemManager
Obsoletes: NetworkManager < 1:0.9.9.1-2
Obsoletes: NetworkManager < %{obsoletes_nmver}
%description wwan
This package contains NetworkManager support for mobile broadband (3G) devices.
This package contains NetworkManager support for mobile broadband (WWAN) devices.
%endif