packages: NetworkManager-applet/NetworkManager-applet.spec - gnome-bt bcond...

[qboosh]

Author: qboosh                       Date: Sun Sep 25 11:08:51 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- gnome-bt bcond
- strict internal deps
- removed empty files from doc
- disable-static instead of building and removing

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

---- Diffs:

================================================================
Index: packages/NetworkManager-applet/NetworkManager-applet.spec
diff -u packages/NetworkManager-applet/NetworkManager-applet.spec:1.36 packages/NetworkManager-applet/NetworkManager-applet.spec:1.37
--- packages/NetworkManager-applet/NetworkManager-applet.spec:1.36	Mon Sep 19 13:55:08 2011
+++ packages/NetworkManager-applet/NetworkManager-applet.spec	Sun Sep 25 13:08:46 2011
@@ -1,5 +1,9 @@
 # $Revision$, $Date$
-%define		nmversion %{version}
+#
+# Conditional build:
+%bcond_without	gnomebt		# GNOME-Bluetooth plugin
+#
+%define		nmversion 2:%{version}
 Summary:	Network Manager for GNOME
 Summary(pl.UTF-8):	Zarządca sieci dla GNOME
 Name:		NetworkManager-applet
@@ -11,20 +15,20 @@
 # Source0-md5:	d1716f7d3b97010d0486755f5c7cc831
 URL:		http://projects.gnome.org/NetworkManager/
 BuildRequires:	GConf2-devel >= 2.20.0
-BuildRequires:	NetworkManager-devel >= 2:%{nmversion}
+BuildRequires:	NetworkManager-devel >= %{nmversion}
 BuildRequires:	autoconf >= 2.63
 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
+%{?with_gnomebt:BuildRequires:	gnome-bluetooth-devel >= 2.28.0}
 BuildRequires:	gnome-common
 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
+BuildRequires:	libnotify-devel >= 0.4.3
 BuildRequires:	libtool >= 2:2.2.6
 BuildRequires:	pkgconfig
 BuildRequires:	polkit-devel >= 0.92
@@ -34,7 +38,7 @@
 Requires(post,postun):	gtk-update-icon-cache
 Requires(post,postun):	hicolor-icon-theme
 Requires(post,preun):	GConf2
-Requires:	NetworkManager >= 2:%{nmversion}
+Requires:	NetworkManager >= %{nmversion}
 Requires:	dbus >= 1.2.6
 Requires:	mobile-broadband-provider-info
 Requires:	polkit-gnome
@@ -54,7 +58,7 @@
 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
@@ -74,7 +78,9 @@
 %{__autoheader}
 %{__automake}
 %configure \
-	--disable-silent-rules
+	--disable-silent-rules \
+	--disable-static \
+	%{!?with_gnomebt:--without-bluetooth}
 %{__make}
 
 %install
@@ -84,7 +90,9 @@
 %{__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
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -103,7 +111,7 @@
 
 %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
@@ -115,9 +123,11 @@
 %{_iconsdir}/hicolor/*/apps/*.png
 %{_iconsdir}/hicolor/*/apps/*.svg
 
+%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
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -125,6 +135,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+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  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.36&r2=1.37&f=u