rpms/cairo-dock/devel cairo-dock.spec,1.2,1.3

[Mamoru Tasaka (mtasaka)]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28787

Modified Files:
	cairo-dock.spec 
Log Message:
* Sat May 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.5.4-4.date20080506
- F-10: don't build weblets plugin until xulrunner BR dependency is solved



Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cairo-dock.spec	16 May 2008 16:53:05 -0000	1.2
+++ cairo-dock.spec	16 May 2008 17:24:35 -0000	1.3
@@ -1,5 +1,6 @@
 %define		tarballver	20080506
 %define		mainver		1.5.5.4
+%define		build_gecko	0
 
 %if 0%{?fedora} >= 9
 %define		gecko_ver	1.9
@@ -10,7 +11,7 @@
 
 Name:		cairo-dock
 Version:	%{mainver}
-Release:	3.date%{tarballver}%{?dist}
+Release:	4.date%{tarballver}%{?dist}
 Summary:	Light eye-candy fully themable animated dock
 
 Group:		User Interface/Desktops
@@ -45,10 +46,12 @@
 BuildRequires:	Thunar-devel
 
 # For plug-ins-gecko
+%if %{build_gecko} > 0
 BuildRequires:	gecko-devel %{?gecko_ver:= %{gecko_ver}}
 %if 0%{?fedora} >= 9
 BuildRequires:	gecko-devel-unstable
 %endif
+%endif
 
 %description
 An light eye-candy fully themable animated dock for any 
@@ -67,6 +70,9 @@
 Summary:	Plug-ins files for %{name}
 Group:		User Interface/Desktops
 Requires:	%{name} = %{version}-%{release}
+%if %{build_gecko} == 0
+Obsoletes:	%{name}-plug-ins-gecko < 1.5.5.4-4
+%endif
 
 %description	plug-ins
 This package contains plug-ins files for %{name}.
@@ -181,6 +187,7 @@
 %{__rm} -rf template/
 
 # weblets
+%if %{build_gecko} > 0
 %if 0%{?fedora} < 9
 cd weblets/
 %{__sed} -i.gecko \
@@ -188,6 +195,9 @@
 	configure.ac
 cd ..
 %endif
+%else
+%{__rm} -rf weblets/
+%endif
 
 for dir in */
 	do
@@ -410,9 +420,11 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plug-in/*xfce*
 
+%if %{build_gecko} > 0
 %files	plug-ins-gecko -f lang-gecko.lang
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/plug-in/*weblet*
+%endif
 
 %files	devel
 %defattr(-,root,root,-)
@@ -420,6 +432,9 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sat May 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.5.4-4.date20080506
+- F-10: don't build weblets plugin until xulrunner BR dependency is solved
+
 * Sat May 17 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.5.5.4-3.date20080506
 - Misc cleanup
 - Remove template, upstream says this is not needed