packages: iceweasel/iceweasel.spec - up to 3.5.6; plugins dir back for xulr...

[arekm]

Author: arekm                        Date: Wed Dec 16 18:38:07 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 3.5.6; plugins dir back for xulrunner based version, too

---- Files affected:
packages/iceweasel:
   iceweasel.spec (1.81 -> 1.82) 

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.81 packages/iceweasel/iceweasel.spec:1.82
--- packages/iceweasel/iceweasel.spec:1.81	Wed Dec 16 18:50:36 2009
+++ packages/iceweasel/iceweasel.spec	Wed Dec 16 19:38:02 2009
@@ -31,12 +31,12 @@
 Summary(hu.UTF-8):	Iceweasel web böngésző
 Summary(pl.UTF-8):	Iceweasel - przeglądarka WWW
 Name:		iceweasel
-Version:	3.5.5
-Release:	2
+Version:	3.5.6
+Release:	1
 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
-# Source0-md5:	b3d92dfb40584141dc1068efc9bdfccc
+# Source0-md5:	54d73156dfedc6e4981f2a3c46817f9a
 Source1:	%{name}-branding.tar.bz2
 # Source1-md5:	b49feae9f6434eca8a749776160c15a8
 Source2:	%{name}-rm_nonfree.sh
@@ -274,6 +274,9 @@
 	MOZ_PKG_APPDIR=%{_libdir}/%{name} \
 	PKG_SKIP_STRIP=1
 
+install -d \
+	$RPM_BUILD_ROOT%{_libdir}/%{name}/plugins
+
 # move arch independant ones to datadir
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/chrome $RPM_BUILD_ROOT%{_datadir}/%{name}/chrome
 mv $RPM_BUILD_ROOT%{_libdir}/%{name}/defaults $RPM_BUILD_ROOT%{_datadir}/%{name}/defaults
@@ -467,13 +470,14 @@
 %endif
 
 %attr(755,root,root) %{_libdir}/%{name}/iceweasel
+%dir %{_libdir}/%{name}/plugins
 %if %{without xulrunner}
 %attr(755,root,root) %{_libdir}/%{name}/run-mozilla.sh
 %attr(755,root,root) %{_libdir}/%{name}/iceweasel-bin
-%dir %{_libdir}/%{name}/plugins
 %attr(755,root,root) %{_libdir}/%{name}/plugins/*.so
 %attr(755,root,root) %{_libdir}/%{name}/mozilla-xremote-client
 %endif
+
 %{_pixmapsdir}/iceweasel.png
 %{_desktopdir}/iceweasel.desktop
 
@@ -522,6 +526,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.82  2009/12/16 18:38:02  arekm
+- up to 3.5.6; plugins dir back for xulrunner based version, too
+
 Revision 1.81  2009/12/16 17:50:36  arekm
 - get plugins even when build with/without xulrunner
 
================================================================

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