rpms/cairo-dock/devel cairo-dock.spec,1.95,1.96

[Mamoru Tasaka]

Author: mtasaka

Update of /cvs/extras/rpms/cairo-dock/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5232

Modified Files:
	cairo-dock.spec 
Log Message:
Don't build xfce plugin, Thunar-devel <- exo-devel <- hal-devel


Index: cairo-dock.spec
===================================================================
RCS file: /cvs/extras/rpms/cairo-dock/devel/cairo-dock.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- cairo-dock.spec	6 Dec 2008 17:38:17 -0000	1.95
+++ cairo-dock.spec	6 Dec 2008 18:25:08 -0000	1.96
@@ -10,6 +10,9 @@
 %define		mainver		2.0.0
 %undefine		betaver		
 %define		build_webkit	1
+## Don't build xfce plugin until hal-devel provides pkgconfig
+## related dependency
+%define		build_xfce	0
 %define		tarballver	svn1428_trunk
 
 %define		fedora_main_rel	1
@@ -73,9 +76,13 @@
 BuildRequires:	libXxf86vm-devel
 BuildRequires:	vte-devel
 # For plug-ins-xfce
+%if %{build_xfce} > 0
 BuildRequires:	Thunar-devel
+%endif
+%if %{build_webkit} > 0
 # For plug-ins-webkit
 BuildRequires:	WebKit-gtk-devel
+%endif
 
 # Obsoletes moved to main package
 # Switch to Webkit, always obsolete gecko (and _not_ provide it)
@@ -83,6 +90,9 @@
 %if %{build_webkit} == 0
 Obsoletes:	%{name}-plug-ins-webkit < %{version}-%{release}
 %endif
+%if %{build_xfce} == 0
+Obsoletes:	%{name}-plug-ins-xfce < %{version}-%{release}
+%endif
 
 %description
 An light eye-candy fully themable animated dock for any 
@@ -590,17 +600,21 @@
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*
 %{_datadir}/%{name}/plug-ins/*
-%if %{build_webkit}
+%if %{build_webkit} > 0
 %exclude	%{_libdir}/%{name}/*weblet*
 %exclude	%{_datadir}/%{name}/plug-ins/*weblet*
 %endif
+%if %{build_xfce} > 0
 %exclude	%{_libdir}/%{name}/*xfce*
 %exclude	%{_datadir}/%{name}/plug-ins/*xfce*
+%endif
 
+%if %{build_xfce} > 0
 %files	plug-ins-xfce
 %defattr(-,root,root,-)
 %{_libdir}/%{name}/*xfce*
 %{_datadir}/%{name}/plug-ins/*xfce*
+%endif
 
 %if %{build_webkit} > 0
 %files	plug-ins-webkit -f lang-webkit.lang
@@ -619,6 +633,8 @@
 - Try 2.0.0 development branch
 - Build weblet plugin with WebKit, switching from Gecko,
   rename weblet related plugin
+- Disable xfce related plugin for now until hal-devel is properly
+  rebuilt
 
 * Wed Nov 12 2008 Mamoru Tasaka <mtasaka at ioa.s.u-tokyo.ac.jp> - 1.6.3.1-1
 - 1.6.3.1