packages: icedove/icedove.spec - fixed xulrunner version - don't provide li...

[qboosh]

Author: qboosh                       Date: Tue May 29 17:37:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed xulrunner version
- don't provide libmozalloc.so when building with included xulrunner
- normally require xulrunner libs when building with system xulrunner

---- Files affected:
packages/icedove:
   icedove.spec (1.156 -> 1.157) 

---- Diffs:

================================================================
Index: packages/icedove/icedove.spec
diff -u packages/icedove/icedove.spec:1.156 packages/icedove/icedove.spec:1.157
--- packages/icedove/icedove.spec:1.156	Thu May 17 09:50:40 2012
+++ packages/icedove/icedove.spec	Tue May 29 19:37:31 2012
@@ -26,7 +26,7 @@
 
 # convert thunderbird release number to platform version: 12.0.x -> 12.0.x
 %define		xulrunner_main	12.0
-%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#11.0})
+%define		xulrunner_ver	%(v=%{version}; echo %{xulrunner_main}${v#12.0})
 
 %if %{without xulrunner}
 # The actual sqlite version (see RHBZ#480989):
@@ -117,10 +117,12 @@
 
 # iceweasel/icedove/iceape provide their own versions
 %define		_noautoprovfiles	%{_libdir}/%{name}/components
-# we don't want these to satisfy xulrunner-devel
-%define		_noautoprov		libmozjs.so libxpcom.so libxul.so
+%if %{without xulrunner}
+# we don't want these to satisfy packages depending on xulrunner
+%define		_noautoprov		libmozalloc.so libxpcom.so libxul.so
 # and as we don't provide them, don't require either
-%define		_noautoreq		libmozjs.so libxpcom.so libxul.so
+%define		_noautoreq		libmozalloc.so libxpcom.so libxul.so
+%endif
 
 %define		topdir		%{_builddir}/%{name}-%{version}
 %define		objdir		%{topdir}/obj-%{_target_cpu}
@@ -571,6 +573,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.157  2012/05/29 17:37:31  qboosh
+- fixed xulrunner version
+- don't provide libmozalloc.so when building with included xulrunner
+- normally require xulrunner libs when building with system xulrunner
+
 Revision 1.156  2012/05/17 07:50:40  zawadaa
 - up to 12.0.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/packages/icedove/icedove.spec?r1=1.156&r2=1.157