Update to a git snapshot (git20140314 git:45a326d) and fix Obsoletes

Fix obsoleting and requiring packages due to splitout of -atm, -bt and -wwan.
It is needed so that new packages are installed on update.
This commit is contained in:
Jiří Klimeš 2014-03-13 17:56:20 +01:00
parent a36fa77d88
commit 251fa91d5d
3 changed files with 14 additions and 4 deletions

1
.gitignore vendored
View File

@ -301,3 +301,4 @@ network-manager-applet-0.8.1.tar.bz2
/NetworkManager-0.9.9.0.git20140131.5d6a5f8.tar.bz2 /NetworkManager-0.9.9.0.git20140131.5d6a5f8.tar.bz2
/NetworkManager-0.9.9.1.git20140228.16bbc90.tar.bz2 /NetworkManager-0.9.9.1.git20140228.16bbc90.tar.bz2
/NetworkManager-0.9.9.1.git20140310.350b6d6.tar.bz2 /NetworkManager-0.9.9.1.git20140310.350b6d6.tar.bz2
/NetworkManager-0.9.9.1.git20140314.45a326d.tar.bz2

View File

@ -6,8 +6,8 @@
%define libnl3_version 3.2.7 %define libnl3_version 3.2.7
%define ppp_version 2.4.5 %define ppp_version 2.4.5
%define snapshot .git20140310 %define snapshot .git20140314
%define git_sha .350b6d6 %define git_sha .45a326d
%define realversion 0.9.9.1 %define realversion 0.9.9.1
%global with_nmtui 1 %global with_nmtui 1
@ -44,7 +44,7 @@ Name: NetworkManager
Summary: Network connection manager and user applications Summary: Network connection manager and user applications
Epoch: 1 Epoch: 1
Version: 0.9.9.1 Version: 0.9.9.1
Release: 1%{snapshot}%{?dist} Release: 2%{snapshot}%{?dist}
Group: System Environment/Base Group: System Environment/Base
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ URL: http://www.gnome.org/projects/NetworkManager/
@ -80,6 +80,7 @@ Requires: dnsmasq
Requires: udev Requires: udev
Requires: iptables Requires: iptables
Obsoletes: dhcdbd Obsoletes: dhcdbd
Obsoletes: NetworkManager < 1:0.9.9.1-2
Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1 Conflicts: NetworkManager-vpnc < 1:0.7.0.99-1
Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1 Conflicts: NetworkManager-openvpn < 1:0.7.0.99-1
@ -143,6 +144,7 @@ provides VPN integration with a variety of different VPN services.
Summary: ADSL device plugin for NetworkManager Summary: ADSL device plugin for NetworkManager
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: NetworkManager < 1:0.9.9.1-2
%description atm %description atm
This package contains NetworkManager support for ADSL devices. This package contains NetworkManager support for ADSL devices.
@ -154,6 +156,8 @@ This package contains NetworkManager support for ADSL devices.
Summary: Bluetooth device plugin for NetworkManager 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
Obsoletes: NetworkManager < 1:0.9.9.1-2
%description bt %description bt
This package contains NetworkManager support for Bluetooth devices. This package contains NetworkManager support for Bluetooth devices.
@ -165,6 +169,7 @@ This package contains NetworkManager support for Bluetooth devices.
Summary: Mobile broadband device plugin for NetworkManager Summary: Mobile broadband device plugin for NetworkManager
Group: System Environment/Base Group: System Environment/Base
Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release} Requires: %{name}%{?_isa} = %{epoch}:%{version}-%{release}
Obsoletes: NetworkManager < 1:0.9.9.1-2
%description wwan %description wwan
This package contains NetworkManager support for mobile broadband (3G) devices. This package contains NetworkManager support for mobile broadband (3G) devices.
@ -494,6 +499,10 @@ fi
%{_bindir}/nmtui-hostname %{_bindir}/nmtui-hostname
%changelog %changelog
* Fri Mar 14 2014 Jiří Klimeš <jklimes@redhat.com> - 0.9.9.1-2.git20140314
- Update to a git snapshot (git20140314 git:45a326d)
- Fix Obsoletes and Requires to perform updates correctly
* Mon Mar 10 2014 Jiří Klimeš <jklimes@redhat.com> - 0.9.9.1-1.git20140310 * Mon Mar 10 2014 Jiří Klimeš <jklimes@redhat.com> - 0.9.9.1-1.git20140310
- Update to a git snapshot (git20140310 git:350b6d6) - Update to a git snapshot (git20140310 git:350b6d6)

View File

@ -1 +1 @@
d8c2b019b91c535a976e8a20dbb6a4b2 NetworkManager-0.9.9.1.git20140310.350b6d6.tar.bz2 d18626c2851747ff5a382fc961b04e62 NetworkManager-0.9.9.1.git20140314.45a326d.tar.bz2