From a60d50f39b04277daf72cd59c507036d12d32161 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Kie=C5=9B?= <kiesiu@pld-linux.org>
Date: Wed, 6 Apr 2011 18:39:51 +0000
Subject: [PATCH] - merged from DEVEL

Changed files:
    NetworkManager-applet.spec -> 1.31
---
 NetworkManager-applet.spec | 22 ++++++++++------------
 1 file changed, 10 insertions(+), 12 deletions(-)

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index a94073a..6ad7fd2 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -2,13 +2,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}
@@ -17,15 +16,15 @@ BuildRequires:	automake >= 1:1.10
 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
@@ -63,7 +62,6 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth.
 
 %prep
 %setup -q -n network-manager-applet-%{version}
-%patch0 -p1
 
 %build
 %{__intltoolize}
@@ -83,7 +81,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 %{__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
 
@@ -109,10 +107,10 @@ rm -rf $RPM_BUILD_ROOT
 %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)
-- 
2.44.0