- merge from DEVEL

Changed files:
    NetworkManager-applet.spec -> 1.38

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index ad99451c5a156d21ff0de4762c26b4112aae838e..59caa503e86de7d6e726210cf0c2ec9bab97c947 100644 (file)
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -6,12 +6,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}
@@ -25,6 +25,7 @@ BuildRequires:        glib2-devel >= 1:2.16.0
 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
@@ -38,6 +39,7 @@ Requires(post,postun):        gtk-update-icon-cache
 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
@@ -53,6 +55,21 @@ Network Manager Applet for GNOME.
 %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
@@ -92,6 +109,7 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 %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
 
@@ -108,6 +126,9 @@ rm -rf $RPM_BUILD_ROOT
 %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
@@ -122,6 +143,18 @@ rm -rf $RPM_BUILD_ROOT
 %{_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)