packages: NetworkManager-applet/NetworkManager-applet.spec - merged from DEVEL

[kiesiu]

Author: kiesiu                       Date: Wed Apr  6 18:39:56 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
packages/NetworkManager-applet:
   NetworkManager-applet.spec (1.30 -> 1.31) 

---- Diffs:

================================================================
Index: packages/NetworkManager-applet/NetworkManager-applet.spec
diff -u packages/NetworkManager-applet/NetworkManager-applet.spec:1.30 packages/NetworkManager-applet/NetworkManager-applet.spec:1.31
--- packages/NetworkManager-applet/NetworkManager-applet.spec:1.30	Wed Apr  6 19:00:17 2011
+++ packages/NetworkManager-applet/NetworkManager-applet.spec	Wed Apr  6 20:39:51 2011
@@ -3,13 +3,12 @@
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.8.2
-Release:	4
+Version:	0.8.998
+Release:	1
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.8/network-manager-applet-%{version}.tar.bz2
-# Source0-md5:	e35d3c391edca440c24032e05870c130
-Patch0:		%{name}-gtk224.patch
+# Source0-md5:	60f33c7d2153a98a1036acab2bc71c6f
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	NetworkManager-devel >= %{nmversion}
@@ -18,15 +17,15 @@
 BuildRequires:	dbus-devel >= 1.2.6
 BuildRequires:	dbus-glib-devel >= 0.74
 BuildRequires:	gettext-devel
+BuildRequires:	glib2-devel >= 1:2.16.0
 BuildRequires:	gnome-bluetooth-devel >= 2.28.0
 BuildRequires:	gnome-common
-BuildRequires:	gtk+2-devel >= 2:2.24.0
-BuildRequires:	intltool >= 0.36.2
-BuildRequires:	libglade2-devel
+BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	intltool >= 0.40.0
 BuildRequires:	libgnome-keyring-devel >= 2.20.0
 BuildRequires:	libiw-devel >= 1:28-0.pre9.1
-BuildRequires:	libnotify-devel >= 0.4.3
-BuildRequires:	libtool
+BuildRequires:	libnotify-devel >= 0.7.0
+BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.92
 BuildRequires:	rpmbuild(macros) >= 1.311
@@ -64,7 +63,6 @@
 
 %prep
 %setup -q -n network-manager-applet-%{version}
-%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -84,7 +82,7 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.{a,la}
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.{a,la}
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -110,10 +108,10 @@
 %dir %{_datadir}/gnome-vpn-properties
 %{_datadir}/nm-applet
 %{_sysconfdir}/xdg/autostart/nm-applet.desktop
+%{_desktopdir}/nm-applet.desktop
 %{_desktopdir}/nm-connection-editor.desktop
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_iconsdir}/hicolor/*/apps/*.svg
-%config(noreplace) %verify(not md5 mtime size) /etc/dbus-1/system.d/nm-applet.conf
 
 %files -n gnome-bluetooth-plugin-nma
 %defattr(644,root,root,755)
@@ -125,12 +123,25 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.31  2011/04/06 18:39:51  kiesiu
+- merged from DEVEL
+
 Revision 1.30  2011/04/06 17:00:17  lisu
 - fix build with gtk+2 >= 2.24.0
 - rel 4
 
 Revision 1.29  2011/04/06 13:23:04  lisu
 - rel 3
+
+Revision 1.28.2.3  2011/04/06 09:53:28  kiesiu
+- up to 0.8.998
+- use gtk+3, remove libglade2 dep
+
+Revision 1.28.2.2  2011/03/23 22:51:05  wiget
+- up to 0.8.997
+
+Revision 1.28.2.1  2011/03/11 23:33:10  megabajt
+- updated to 0.8.996
 
 Revision 1.28  2011/02/04 18:23:58  wiget
 - Requires(post,postun): gtk-update-icon-cache
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/NetworkManager-applet/NetworkManager-applet.spec?r1=1.30&r2=1.31&f=u