packages: iceweasel/iceweasel.spec - updated branding; added -branding-abou...

[megabajt]

Author: megabajt                     Date: Wed Jun 22 21:37:34 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated branding; added -branding-aboutDialog.patch to fix about dialog
- fixed condition (symlink to xulrunner libs is needed when building with
  system xulrunner)

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.146 -> 1.147) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.146 packages/iceweasel/iceweasel.spec:1.147
--- packages/iceweasel/iceweasel.spec:1.146	Wed Jun 22 23:02:30 2011
+++ packages/iceweasel/iceweasel.spec	Wed Jun 22 23:37:29 2011
@@ -37,7 +37,7 @@
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
 # Source0-md5:	9f64a01e86a5d424e12a8e3305c5debe
 Source1:	%{name}-branding.tar.bz2
-# Source1-md5:	7ab5e80db1ffe8784f1cb55dc5651e2f
+# Source1-md5:	721c6341a7df04ad46744ba044823d2b
 Source2:	%{name}-rm_nonfree.sh
 Source3:	%{name}.desktop
 Source4:	%{name}.sh
@@ -52,6 +52,8 @@
 Patch8:		%{name}-pld-branding.patch
 Patch9:		%{name}-no-subshell.patch
 Patch10:	%{name}-ppc.patch
+# https://bugzilla.mozilla.org/show_bug.cgi?id=652306
+Patch11:	%{name}-branding-aboutDialog.patch
 URL:		http://www.pld-linux.org/Packages/Iceweasel
 BuildRequires:	Mesa-libGL-devel
 %{?with_gnomevfs:BuildRequires:	GConf2-devel >= 1.2.1}
@@ -177,6 +179,7 @@
 %patch8 -p1
 %patch9 -p2
 %patch10 -p1
+%patch11 -p1
 
 %build
 cd mozilla
@@ -278,7 +281,7 @@
 install -d \
 	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
 
-%if %{without xulrunner}
+%if %{with xulrunner}
 # >= 5.0 seems to require this
 ln -s ../xulrunner $RPM_BUILD_ROOT%{_libdir}/%{name}/xulrunner
 %endif
@@ -507,11 +510,13 @@
 %{_libdir}/%{name}/icons
 %{_libdir}/%{name}/modules
 %{_libdir}/%{name}/searchplugins
+%if %{with xulrunner}
+%{_libdir}/%{name}/xulrunner
+%endif
 %if %{without xulrunner}
 %{_libdir}/%{name}/dictionaries
 %{_libdir}/%{name}/greprefs.js
 %{_libdir}/%{name}/res
-%{_libdir}/%{name}/xulrunner
 %endif
 
 %dir %{_datadir}/%{name}
@@ -541,6 +546,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.147  2011/06/22 21:37:29  megabajt
+- updated branding; added -branding-aboutDialog.patch to fix about dialog
+- fixed condition (symlink to xulrunner libs is needed when building with
+  system xulrunner)
+
 Revision 1.146  2011/06/22 21:02:30  arekm
 - xulrunner symlink
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/iceweasel/iceweasel.spec?r1=1.146&r2=1.147&f=u