rpms/network-manager-applet
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix the versioned obsoletes

Browse Source 
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.
This commit is contained in:
Kalev Lember 2012-07-14 21:04:18 +03:00
parent b8b06eda40
commit b4d07c8ca8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
network-manager-applet.spec
View File

@ -3,7 +3,7 @@
%define dbus_version 1.4 %define dbus_version 1.4
%define dbus_glib_version 0.86 %define dbus_glib_version 0.86
%define nm_version 1:0.9.5.95 %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 snapshot .git20120713
%define realversion 0.9.5.95 %define realversion 0.9.5.95
@ -11,11 +11,11 @@
Name: network-manager-applet Name: network-manager-applet
Summary: A network control and status applet for NetworkManager Summary: A network control and status applet for NetworkManager
Version: 0.9.5.95 Version: 0.9.5.95
Release: 1%{snapshot}%{?dist} Release: 2%{snapshot}%{?dist}
Group: Applications/System Group: Applications/System
License: GPLv2+ License: GPLv2+
URL: http://www.gnome.org/projects/NetworkManager/ 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 Source: http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/%{name}-%{realversion}%{snapshot}.tar.bz2
Patch0: nm-applet-no-notifications.patch Patch0: nm-applet-no-notifications.patch
@ -83,7 +83,7 @@ Summary: Private libraries for NetworkManager GUI support
Group: Development/Libraries Group: Development/Libraries
Requires: gtk3 >= %{gtk3_version} Requires: gtk3 >= %{gtk3_version}
Requires: mobile-broadband-provider-info >= 0.20090602 Requires: mobile-broadband-provider-info >= 0.20090602
Obsoletes: NetworkManager-gtk <= %{obsoletes_ver} Obsoletes: NetworkManager-gtk < %{obsoletes_ver}
%description -n libnm-gtk %description -n libnm-gtk
This package contains private libraries to be used only by nm-applet, 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 Group: Development/Libraries
Requires: NetworkManager-devel >= %{nm_version} Requires: NetworkManager-devel >= %{nm_version}
Requires: NetworkManager-glib-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: libnm-gtk = %{version}-%{release}
Requires: gtk3-devel Requires: gtk3-devel
Requires: pkgconfig Requires: pkgconfig
@ -223,6 +223,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_libdir}/libnm-gtk.so %{_libdir}/libnm-gtk.so
%changelog %changelog
* Sat Jul 14 2012 Kalev Lember <kalevlember@gmail.com> - 0.9.5.95-2.git20120713
- Fix the versioned obsoletes
* Fri Jul 13 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.5.95-1.git20120713 * Fri Jul 13 2012 Jiří Klimeš <jklimes@redhat.com> - 0.9.5.95-1.git20120713
- update to 0.9.5.95 (0.9.6-rc1) snapshot - update to 0.9.5.95 (0.9.6-rc1) snapshot
- editor: fixed UI mnemonics - editor: fixed UI mnemonics