packages: iceweasel/iceweasel.spec - get plugins even when build with/witho...

[arekm]

Author: arekm                        Date: Wed Dec 16 17:50:41 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- get plugins even when build with/without xulrunner

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

---- Diffs:

================================================================
Index: packages/iceweasel/iceweasel.spec
diff -u packages/iceweasel/iceweasel.spec:1.80 packages/iceweasel/iceweasel.spec:1.81
--- packages/iceweasel/iceweasel.spec:1.80	Mon Dec  7 14:57:10 2009
+++ packages/iceweasel/iceweasel.spec	Wed Dec 16 18:50:36 2009
@@ -267,9 +267,7 @@
 	$RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \
 	$RPM_BUILD_ROOT%{_datadir}/%{name}
 
-%if %{without xulrunner}
 %browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
-%endif
 
 %{__make} -C obj-%{_target_cpu}/browser/installer stage-package \
 	DESTDIR=$RPM_BUILD_ROOT \
@@ -357,16 +355,12 @@
 
 %post
 %{_sbindir}/%{name}-chrome+xpcom-generate
-%if %{without xulrunner}
 %update_browser_plugins
-%endif
 
-%if %{without xulrunner}
 %postun
 if [ "$1" = 0 ]; then
 	%update_browser_plugins
 fi
-%endif
 
 %files
 %defattr(644,root,root,755)
@@ -375,11 +369,9 @@
 %attr(755,root,root) %{_bindir}/mozilla-firefox
 %attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate
 
-%if %{without xulrunner}
 # browser plugins v2
 %{_browserpluginsconfdir}/browsers.d/%{name}.*
 %config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
-%endif
 
 %dir %{_libdir}/%{name}
 
@@ -530,6 +522,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.81  2009/12/16 17:50:36  arekm
+- get plugins even when build with/without xulrunner
+
 Revision 1.80  2009/12/07 13:57:10  sparky
 - BR: alsa-lib-devel, dbus-glib-devel, python-modules
 - dropped BR: glib2-devel (required by gtk+2-devel)
================================================================

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