[network-manager-applet] Fix the versioned obsoletes
Kalev Lember
kalev at fedoraproject.org
Sat Jul 14 18:49:45 UTC 2012
commit b4d07c8ca8963eed87c92a7069eeb5aae4da6475
Author: Kalev Lember <kalevlember at gmail.com>
Date: Sat Jul 14 21:04:18 2012 +0300
Fix the versioned obsoletes
This makes sure that the obsoletes cover the version of NM packages in
F17. It currently has 1:0.9.4.0, so obsoleting anything older than
1:0.9.5 should hopefully cover any possible F17 NM versions.
network-manager-applet.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/network-manager-applet.spec b/network-manager-applet.spec
index 21af99d..bdee666 100644
--- a/network-manager-applet.spec
+++ b/network-manager-applet.spec
@@ -3,7 +3,7 @@
%define dbus_version 1.4
%define dbus_glib_version 0.86
%define nm_version 1:0.9.5.95
-%define obsoletes_ver 1:0.9.3.997-2
+%define obsoletes_ver 1:0.9.5
%define snapshot .git20120713
%define realversion 0.9.5.95
@@ -11,11 +11,11 @@
Name: network-manager-applet
Summary: A network control and status applet for NetworkManager
Version: 0.9.5.95
-Release: 1%{snapshot}%{?dist}
+Release: 2%{snapshot}%{?dist}
Group: Applications/System
License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/
-Obsoletes: NetworkManager-gnome <= %{obsoletes_ver}
+Obsoletes: NetworkManager-gnome < %{obsoletes_ver}
Source: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/%{name}-%{realversion}%{snapshot}.tar.bz2
Patch0: nm-applet-no-notifications.patch
@@ -83,7 +83,7 @@ Summary: Private libraries for NetworkManager GUI support
Group: Development/Libraries
Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602
-Obsoletes: NetworkManager-gtk <= %{obsoletes_ver}
+Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnm-gtk
This package contains private libraries to be used only by nm-applet,
@@ -94,7 +94,7 @@ Summary: Private header files for NetworkManager GUI support
Group: Development/Libraries
Requires: NetworkManager-devel >= %{nm_version}
Requires: NetworkManager-glib-devel >= %{nm_version}
-Obsoletes: NetworkManager-gtk-devel <= %{obsoletes_ver}
+Obsoletes: NetworkManager-gtk-devel < %{obsoletes_ver}
Requires: libnm-gtk = %{version}-%{release}
Requires: gtk3-devel
Requires: pkgconfig
@@ -223,6 +223,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so
%changelog
+* Sat Jul 14 2012 Kalev Lember <kalevlember at gmail.com> - 0.9.5.95-2.git20120713
+- Fix the versioned obsoletes
+
* Fri Jul 13 2012 Jiří Klimeš <jklimes at redhat.com> - 0.9.5.95-1.git20120713
- update to 0.9.5.95 (0.9.6-rc1) snapshot
- editor: fixed UI mnemonics
More information about the scm-commits
mailing list