packages: iceweasel/iceweasel.spec - with xulrunner fixes; rel 2

[glen]

Author: glen                         Date: Thu Sep 10 10:35:33 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- with xulrunner fixes; rel 2

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.66 -> 1.67) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.66 packages/iceweasel/iceweasel.spec:1.67
--- packages/iceweasel/iceweasel.spec:1.66	Thu Sep 10 10:36:49 2009
+++ packages/iceweasel/iceweasel.spec	Thu Sep 10 12:35:27 2009
@@ -13,12 +13,15 @@
 %undefine	with_gnomevfs
 %endif
 
+# keep xulrunner built from same source
+%define		xulrunner_ver	%(echo %{version} | sed -e 's,3\.5,1.9.1,')
+
 Summary:	Iceweasel web browser
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
 Version:	3.5.3
-Release:	1
+Release:	2
 License:	MPL 1.1 or GPL v2+ or LGPL v2.1+
 Group:		X11/Applications/Networking
 Source0:	ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}.source.tar.bz2
@@ -71,7 +74,8 @@
 BuildRequires:	xorg-lib-libXp-devel
 BuildRequires:	xorg-lib-libXt-devel
 %if %{with xulrunner}
-BuildRequires:	xulrunner-devel >= 1.9.1
+BuildRequires:	xulrunner-devel >= 1:1.9.1.3-2
+BuildRequires:	xulrunner-devel >= 1:%{xulrunner_ver}
 %endif
 BuildRequires:	zip
 BuildRequires:	zlib-devel >= 1.2.3
@@ -271,6 +275,7 @@
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/greprefs $RPM_BUILD_ROOT%{_datadir}/%{name}/greprefs
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/res $RPM_BUILD_ROOT%{_datadir}/%{name}/res
 %endif
+
 ln -s ../../share/%{name}/chrome $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome
 ln -s ../../share/%{name}/defaults $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults
 ln -s ../../share/%{name}/extensions $RPM_BUILD_ROOT%{_libdir}/%{name}/extensions
@@ -288,17 +293,20 @@
 %endif
 
 sed 's, at LIBDIR@,%{_libdir},' %{SOURCE4} > $RPM_BUILD_ROOT%{_bindir}/iceweasel
+chmod a+rx $RPM_BUILD_ROOT%{_bindir}/iceweasel
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/firefox
 ln -s iceweasel $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox
 
 install iceweasel/branding/default64.png $RPM_BUILD_ROOT%{_pixmapsdir}/iceweasel.png
-
 install %{SOURCE3} $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 # files created by regxpcom and iceweasel -register
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/compreg.dat
 touch $RPM_BUILD_ROOT%{_libdir}/%{name}/components/xpti.dat
 
+%if %{with xulrunner}
+rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/run-mozilla.sh
+%endif
 # what's this? it's content is invalid anyway.
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/dependentlibs.list
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}/old-homepage-default.properties
@@ -318,6 +326,7 @@
 
 rm -rf $HOME
 EOF
+chmod a+rx $RPM_BUILD_ROOT%{_sbindir}/%{name}-chrome+xpcom-generate
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -340,8 +349,8 @@
 %update_browser_plugins
 %endif
 
-%postun
 %if %{without xulrunner}
+%postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
@@ -361,9 +370,11 @@
 %endif
 
 %dir %{_libdir}/%{name}
+
 %if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/*.so
 %endif
+
 %{_libdir}/%{name}/blocklist.xml
 
 %if %{with crashreporter}
@@ -399,6 +410,7 @@
 %{_libdir}/%{name}/components/nsSetDefaultBrowser.js
 %{_libdir}/%{name}/components/nsSidebar.js
 %{_libdir}/%{name}/components/WebContentConverter.js
+
 %if %{without xulrunner}
 %{_libdir}/%{name}/platform.ini
 %{_libdir}/%{name}/components/FeedProcessor.js
@@ -506,6 +518,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.67  2009/09/10 10:35:27  glen
+- with xulrunner fixes; rel 2
+
 Revision 1.66  2009/09/10 08:36:49  duddits
 - CVE notes added
 
@@ -516,7 +531,7 @@
   CVE-2009-3078, CVE-2009-3079
 
 Revision 1.64  2009/08/03 23:30:27  adamg
-- updated to 3.5.2 ( fixes CVE-2009-2467, CVE-2009-2477, CVE-2009-2470 )
+- updated to 3.5.2 (fixes CVE-2009-2467, CVE-2009-2477, CVE-2009-2470 )
 
 Revision 1.63  2009/08/02 21:30:04  glen
 - implicit enable canvas, pango options
================================================================

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