X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=NetworkManager-applet.spec;h=b585808824d37f8bf7d47fc80bf13f25f06d1fde;hb=9a81af787baf11c32d4da292eb1e9ffcc2f9d185;hp=9b300c3003c5261928d5ad92f8561f2d5f5c0332;hpb=e5f028ccb6d0f30d5498ba4d072228ff42cf1cde;p=packages%2FNetworkManager-applet.git

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index 9b300c3..b585808 100644
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,13 +1,17 @@
-%define		nmversion %{version}
+#
+# Conditional build:
+%bcond_without	gnomebt		# GNOME-Bluetooth plugin
+#
+%define		nmversion 2:0.9.4.0
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
-Version:	0.8.999
-Release:	1
+Version:	0.9.4.1
+Release:	2
 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:	5a0885e58da51d9398d4fd52092df13c
+Source0:	http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/network-manager-applet-%{version}.tar.xz
+# Source0-md5:	a8de4ace4a40e432838e434f0bf71e7a
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	GConf2-devel >= 2.20.0
 BuildRequires:	NetworkManager-devel >= %{nmversion}
@@ -17,21 +21,23 @@ 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
+%{?with_gnomebt:BuildRequires:	gnome-bluetooth-devel >= 2.28.0}
 BuildRequires:	gnome-common
-BuildRequires:	gtk+3-devel >= 3.0.0
+BuildRequires:	gtk+3-devel >= 3.2.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.7.0
+BuildRequires:	libnotify-devel >= 0.4.3
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	pkgconfig
-BuildRequires:	polkit-devel >= 0.92
 BuildRequires:	rpmbuild(macros) >= 1.311
+BuildRequires:	tar >= 1:1.22
+BuildRequires:	xz
 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
@@ -47,11 +53,40 @@ Network Manager Applet for GNOME.
 %description -l pl.UTF-8
 Aplet zarządcy sieci dla GNOME.
 
+%package -n NetworkManager-gtk-lib
+Summary:	GTK+ dialogs library for NetworkManager
+Summary(pl.UTF-8):	Biblioteka okien dialogowych GTK+ dla NetworkManagera
+Group:		X11/Libraries
+Requires:	GConf2-libs >= 2.20.0
+Requires:	NetworkManager-libs >= %{nmversion}
+Requires:	gtk+3 >= 3.0.0
+
+%description -n NetworkManager-gtk-lib
+GTK+ dialogs library for NetworkManager.
+
+%description -n NetworkManager-gtk-lib -l pl.UTF-8
+Biblioteka okien dialogowych GTK+ dla NetworkManagera.
+
+%package -n NetworkManager-gtk-lib-devel
+Summary:	Development package for NetworkManager-gtk-lib
+Summary(pl.UTF-8):	Pakiet programistyczny dla NetworkManager-gtk-lib
+Group:		X11/Development/Libraries
+Requires:	NetworkManager-gtk-lib = %{version}-%{release}
+Requires:	GConf2-devel >= 2.20.0
+Requires:	NetworkManager-devel >= %{nmversion}
+Requires:	gtk+3-devel >= 3.0.0
+
+%description -n NetworkManager-gtk-lib-devel
+Header files and libraries for NetworkManager-gtk-lib.
+
+%description -n NetworkManager-gtk-lib-devel -l pl.UTF-8
+Pakiet programistyczny dla 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
 Group:		X11/Applications
-Requires:	NetworkManager-applet >= %{nmversion}
+Requires:	%{name} = %{version}-%{release}
 Requires:	gnome-bluetooth >= 2.28.0
 
 %description -n gnome-bluetooth-plugin-nma
@@ -71,7 +106,9 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth.
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--disable-static \
+	%{!?with_gnomebt:--without-bluetooth}
 %{__make}
 
 %install
@@ -81,7 +118,10 @@ install -d $RPM_BUILD_ROOT%{_datadir}/gnome-vpn-properties
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-%{__rm} $RPM_BUILD_ROOT%{_libdir}/gnome-bluetooth/plugins/*.{a,la}
+%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
 
@@ -98,9 +138,12 @@ 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 NEWS README
+%doc AUTHORS CONTRIBUTING ChangeLog
 %attr(755,root,root) %{_bindir}/nm-applet
 %attr(755,root,root) %{_bindir}/nm-connection-editor
 %{_sysconfdir}/gconf/schemas/nm-applet.schemas
@@ -112,6 +155,20 @@ 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) %{_libdir}/libnm-gtk.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnm-gtk.so.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)
 %attr(755,root,root) %{_libdir}/gnome-bluetooth/plugins/libnma.so
+%endif