SPECS: gnome-applets.spec - now modemlights applet uses liboobs (u...

[megabajt]

Author: megabajt                     Date: Sun Jun 10 12:06:32 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- now modemlights applet uses liboobs (use-liboobs.patch)
- removed modemlights bcond and modemlights-conditional.patch
- release 2

---- Files affected:
SPECS:
   gnome-applets.spec (1.190 -> 1.191) 

---- Diffs:

================================================================
Index: SPECS/gnome-applets.spec
diff -u SPECS/gnome-applets.spec:1.190 SPECS/gnome-applets.spec:1.191
--- SPECS/gnome-applets.spec:1.190	Wed Mar 14 23:27:31 2007
+++ SPECS/gnome-applets.spec	Sun Jun 10 14:06:26 2007
@@ -1,15 +1,11 @@
 # $Revision$, $Date$
-#
-# Conditional build:
-%bcond_without	modemlights	# don't build modemlights applet
-#
 Summary:	Small applications which embed themselves in the GNOME panel
 Summary(pl.UTF-8):	Aplety GNOME - małe aplikacje osadzające się w panelu
 Summary(ru.UTF-8):	Маленькие программы, встраивающиеся в панель GNOME
 Summary(uk.UTF-8):	Маленькі програми, що вбудовуються в панель GNOME
 Name:		gnome-applets
 Version:	2.18.0
-Release:	1
+Release:	2
 Epoch:		1
 License:	GPL v2, FDL
 Group:		X11/Applications
@@ -18,7 +14,7 @@
 Patch0:		%{name}-stickynotes-title-size.patch
 Patch1:		%{name}-m4_fix.patch
 Patch2:		%{name}-desktop.patch
-Patch3:		%{name}-modemlights-conditional.patch
+Patch3:		%{name}-use-liboobs.patch
 URL:		http://www.gnome.org/
 BuildRequires:	GConf2-devel >= 2.18.0.1
 BuildRequires:	autoconf >= 2.59
@@ -45,6 +41,7 @@
 BuildRequires:	libgnomeui-devel >= 2.18.1
 BuildRequires:	libgtop-devel >= 1:2.14.8
 BuildRequires:	libnotify-devel >= 0.4.2
+BuildRequires:	liboobs-devel >= 2.18.1
 BuildRequires:	libtool
 BuildRequires:	libwnck-devel >= 2.18.0
 BuildRequires:	libxklavier-devel >= 3.0
@@ -56,11 +53,6 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.311
 BuildRequires:	scrollkeeper >= 0.3.11-4
-%if %{with modemlights}
-BuildRequires:	system-tools-backends >= 1.4.0
-# XXX: needs fix (it should work with s-t-b 2.1.4)
-BuildRequires:	system-tools-backends < 1.9.0
-%endif
 Requires:	gnome-icon-theme >= 2.18.0
 Requires:	gnome-panel >= 2.18.0
 Requires:	gnome-vfs2 >= 2.18.0.1
@@ -282,8 +274,7 @@
 Group:		X11/Applications
 Requires(post,postun):	gtk+2
 Requires:	%{name} = %{epoch}:%{version}-%{release}
-Requires:	system-tools-backends < 1.9.0
-Requires:	system-tools-backends >= 1.4.0
+Requires:	system-tools-backends
 Conflicts:	gnome-applets <= 0:2.10.0-5
 
 %description modemlights
@@ -359,8 +350,7 @@
 	--disable-static \
 	--disable-schemas-install \
 	--enable-mini-commander \
-	--enable-stickynotes \
-	%{!?with_modemlights:--disable-modemlights}
+	--enable-stickynotes
 %{__make}
 
 %install
@@ -845,7 +835,6 @@
 %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
@@ -854,7 +843,6 @@
 %{_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)
@@ -917,6 +905,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.191  2007/06/10 12:06:26  megabajt
+- now modemlights applet uses liboobs (use-liboobs.patch)
+- removed modemlights bcond and modemlights-conditional.patch
+- release 2
+
 Revision 1.190  2007/03/14 22:27:31  megabajt
 - updated to 2.18.0; merged changes from DEVEL
 
================================================================

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