- gnome-bt bcond

- strict internal deps
- removed empty files from doc
- disable-static instead of building and removing

Changed files:
    NetworkManager-applet.spec -> 1.37

diff --git a/NetworkManager-applet.spec b/NetworkManager-applet.spec
index 9386ef118a8369dc9d47daeca18c6c13a44306a4..ad99451c5a156d21ff0de4762c26b4112aae838e 100644 (file)
--- a/NetworkManager-applet.spec
+++ b/NetworkManager-applet.spec
@@ -1,4 +1,8 @@
-%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
@@ -10,20 +14,20 @@ Source0:    http://ftp.gnome.org/pub/GNOME/sources/network-manager-applet/0.9/netwo
 # 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
@@ -33,7 +37,7 @@ BuildRequires:        xz
 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
@@ -53,7 +57,7 @@ Aplet zarządcy sieci dla GNOME.
 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
@@ -73,7 +77,9 @@ Wtyczka NetworkManager Applet dla GNOME Bluetooth.
 %{__autoheader}
 %{__automake}
 %configure \
-       --disable-silent-rules
+       --disable-silent-rules \
+       --disable-static \
+       %{!?with_gnomebt:--without-bluetooth}
 %{__make}
 
 %install
@@ -83,7 +89,9 @@ 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
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -102,7 +110,7 @@ rm -rf $RPM_BUILD_ROOT
 
 %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
@@ -114,6 +122,8 @@ rm -rf $RPM_BUILD_ROOT
 %{_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