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

[wiget]

Author: wiget                        Date: Thu Sep 29 17:43:14 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- merge from DEVEL

---- Files affected:
packages/NetworkManager-applet:
   NetworkManager-applet.spec (1.37 -> 1.38) 

---- Diffs:

================================================================
Index: packages/NetworkManager-applet/NetworkManager-applet.spec
diff -u packages/NetworkManager-applet/NetworkManager-applet.spec:1.37 packages/NetworkManager-applet/NetworkManager-applet.spec:1.38
--- packages/NetworkManager-applet/NetworkManager-applet.spec:1.37	Sun Sep 25 13:08:46 2011
+++ packages/NetworkManager-applet/NetworkManager-applet.spec	Thu Sep 29 19:43:09 2011
@@ -7,12 +7,12 @@
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.9.0
+Version:	0.9.1.90
 Release:	2
 License:	GPL v2
 Group:		X11/Applications
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/network-manager-applet-%{version}.tar.xz
-# Source0-md5:	d1716f7d3b97010d0486755f5c7cc831
+# Source0-md5:	016b4da01a1866360240c538f3f5c9fa
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	NetworkManager-devel >= %{nmversion}
@@ -26,6 +26,7 @@
 BuildRequires:	gnome-common
 BuildRequires:	gtk+3-devel >= 3.0.0
 BuildRequires:	intltool >= 0.40.0
+BuildRequires:	iso-codes
 BuildRequires:	libgnome-keyring-devel >= 2.20.0
 BuildRequires:	libiw-devel >= 1:28-0.pre9.1
 BuildRequires:	libnotify-devel >= 0.4.3
@@ -39,6 +40,7 @@
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,preun):	GConf2
 Requires:	NetworkManager >= %{nmversion}
+Requires:	NetworkManager-gtk-lib = %{version}-%{release}
 Requires:	dbus >= 1.2.6
 Requires:	mobile-broadband-provider-info
 Requires:	polkit-gnome
@@ -54,6 +56,21 @@
 %description -l pl.UTF-8
 Aplet zarządcy sieci dla GNOME.
 
+%package -n NetworkManager-gtk-lib
+Summary:	GTK+ dialogs for NetworkManager
+Group:		X11/Libraries
+
+%description -n NetworkManager-gtk-lib
+GTK+ dialogs for NetworkManager
+
+%package -n NetworkManager-gtk-lib-devel
+Summary:	Development package for NetworkManager-gtk-lib
+Group:		X11/Development/Libraries
+Requires:	NetworkManager-gtk-lib = %{version}-%{release}
+
+%description -n NetworkManager-gtk-lib-devel
+Header files and libraries for NetworkManager-gtk-lib.
+
 %package -n gnome-bluetooth-plugin-nma
 Summary:	NetworkManager applet plugin for GNOME Bluetooth
 Summary(pl.UTF-8):	Wtyczka NetworkManager Applet dla GNOME Bluetooth
@@ -93,6 +110,7 @@
 %if %{with gnomebt}
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.la
 %endif
+%{__rm}	$RPM_BUILD_ROOT%{_libdir}/libnm-gtk.la
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -109,6 +127,9 @@
 %postun
 %update_icon_cache hicolor
 
+%post   -n NetworkManager-gtk-lib -p /sbin/ldconfig
+%postun -n NetworkManager-gtk-lib -p /sbin/ldconfig
+
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS CONTRIBUTING ChangeLog
@@ -123,6 +144,18 @@
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_iconsdir}/hicolor/*/apps/*.svg
 
+%files -n NetworkManager-gtk-lib
+%defattr(644,root,root,755)
+%attr(755,root,root) %ghost %{_libdir}/libnm-gtk.so.0
+%attr(755,root,root) %{_libdir}/libnm-gtk.so.0.0.0
+%{_datadir}/libnm-gtk
+
+%files -n NetworkManager-gtk-lib-devel
+%defattr(644,root,root,755)
+%{_includedir}/libnm-gtk
+%{_libdir}/libnm-gtk.so
+%{_pkgconfigdir}/libnm-gtk.pc
+
 %if %{with gnomebt}
 %files -n gnome-bluetooth-plugin-nma
 %defattr(644,root,root,755)
@@ -135,11 +168,25 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.38  2011/09/29 17:43:09  wiget
+- merge from DEVEL
+
 Revision 1.37  2011/09/25 11:08:46  qboosh
 - gnome-bt bcond
 - strict internal deps
 - removed empty files from doc
 - disable-static instead of building and removing
+
+Revision 1.36.2.3  2011/09/25 17:29:24  wiget
+- move libnm-gtk to subpackage
+- rel. 2
+
+Revision 1.36.2.2  2011/09/24 21:40:09  kiesiu
+- it requires at least 0.4.3 version of libnotify to build
+- owns libnm-gtk share dir
+
+Revision 1.36.2.1  2011/09/24 17:35:43  wiget
+- up to 0.9.1.90
 
 Revision 1.36  2011/09/19 11:55:08  lisu
 - rel 2
================================================================

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