SPECS: gnome-applets.spec - added without modemlights bcond (modem...

[grzegol]

Author: grzegol                      Date: Sat Aug 26 12:11:22 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- added without modemlights bcond (modemlights applet doesn't build/work with
  system-tools-backends >= 1.9.0)
- added modemlights-conditional patch (allow to build without modemlights
  applet)

---- Files affected:
SPECS:
   gnome-applets.spec (1.176 -> 1.177) 

---- Diffs:

================================================================
Index: SPECS/gnome-applets.spec
diff -u SPECS/gnome-applets.spec:1.176 SPECS/gnome-applets.spec:1.177
--- SPECS/gnome-applets.spec:1.176	Tue Aug 22 21:05:45 2006
+++ SPECS/gnome-applets.spec	Sat Aug 26 14:11:17 2006
@@ -1,4 +1,7 @@
 # $Revision$, $Date$
+#
+# Conditional build:
+%bcond_without	modemlights	# don't build modemlights applet
 Summary:	Small applications which embed themselves in the GNOME panel
 Summary(pl):	Aplety GNOME - małe aplikacje osadzające się w panelu
 Summary(ru):	íÁĚĹÎŘËÉĹ ĐŇĎÇŇÁÍÍŮ, ×ÓÔŇÁÉ×ÁŔÝÉĹÓŃ × ĐÁÎĹĚŘ GNOME
@@ -14,6 +17,7 @@
 Patch0:		%{name}-stickynotes-title-size.patch
 Patch1:		%{name}-m4_fix.patch
 Patch2:		%{name}-desktop.patch
+Patch3:		%{name}-modemlights-conditional.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.14.0
 BuildRequires:	autoconf
@@ -47,7 +51,10 @@
 BuildRequires:	python-gnome-desktop-devel >= 2.15.90
 BuildRequires:	rpmbuild(macros) >= 1.197
 BuildRequires:	scrollkeeper >= 0.3.11-4
+%if %{with modemlights}
 BuildRequires:	system-tools-backends >= 1.4.0
+BuildRequires:	system-tools-backends < 1.9.0
+%endif
 Requires:	gnome-icon-theme >= 2.15.92
 Requires:	gnome-panel >= 2.15.92
 Requires:	gnome-vfs2 >= 2.15.92
@@ -269,7 +276,8 @@
 Group:		X11/Applications
 Requires(post,postun):	gtk+2 >= 2.10.2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	system-tools-backends >= 1.2.0
+Requires:	system-tools-backends >= 1.4.0
+Requires:	susyem-tools-backends < 1.9.0
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description modemlights
@@ -329,6 +337,7 @@
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__gnome_doc_prepare}
@@ -344,7 +353,8 @@
 	--disable-static \
 	--disable-schemas-install \
 	--enable-mini-commander \
-	--enable-stickynotes
+	--enable-stickynotes \
+	%{!?with_modemlights:--disable-modemlights}
 %{__make}
 
 %install
@@ -505,11 +515,13 @@
 %postun mixer
 %scrollkeeper_update_postun
 
+%if %{with modemlights}
 %post modemlights
 %update_icon_cache hicolor
 
 %postun modemlights
 %update_icon_cache hicolor
+%endif
 
 %post multiload
 %scrollkeeper_update_post
@@ -800,6 +812,7 @@
 %lang(sv) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-sv.omf
 %lang(uk) %{_omf_dest_dir}/mixer_applet2/mixer_applet2-uk.omf
 
+%if %{with modemlights}
 %files modemlights
 %defattr(644,root,root,755)
 %doc modemlights/ChangeLog
@@ -808,6 +821,7 @@
 %{_datadir}/gnome-2.0/ui/GNOME_ModemLights.xml
 %{_datadir}/%{name}/glade/modemlights.glade
 %{_iconsdir}/hicolor/*/apps/gnome-modem-monitor-applet.*
+%endif
 
 %files multiload -f multiload.lang
 %defattr(644,root,root,755)
@@ -864,6 +878,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.177  2006/08/26 12:11:17  grzegol
+- added without modemlights bcond (modemlights applet doesn't build/work with
+  system-tools-backends >= 1.9.0)
+- added modemlights-conditional patch (allow to build without modemlights
+  applet)
+
 Revision 1.176  2006/08/22 19:05:45  freetz
 - 2.15.90, updated deps, update icon cache when required, updated file list
   remove es_* locale, enable by default sticky notes! because we hate
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/gnome-applets.spec?r1=1.176&r2=1.177&f=u