Author: glen Date: Wed Apr 7 18:27:55 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- add browser plugins integration
---- Files affected:
packages/mozilla-firefox-bin:
mozilla-firefox-bin.spec (1.53 -> 1.54)
---- Diffs:
================================================================
Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec
diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.53
packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.54
--- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.53 Sun Apr 4
21:57:31 2010
+++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec Wed Apr 7
20:27:50 2010
@@ -1,4 +1,22 @@
# $Revision$, $Date$
+# TODO
+# /usr/lib/mozilla-firefox-bin/.autoreg
+# /usr/lib/mozilla-firefox-bin/LICENSE
+# /usr/lib/mozilla-firefox-bin/README.txt
+# /usr/lib/mozilla-firefox-bin/Throbber-small.gif
+# /usr/lib/mozilla-firefox-bin/blocklist.xml
+# /usr/lib/mozilla-firefox-bin/components/components.list
+# /usr/lib/mozilla-firefox-bin/crashreporter
+# /usr/lib/mozilla-firefox-bin/crashreporter-override.ini
+# /usr/lib/mozilla-firefox-bin/crashreporter.ini
+#
/usr/lib/mozilla-firefox-bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
+#
/usr/lib/mozilla-firefox-bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
+#
/usr/lib/mozilla-firefox-bin/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
+# /usr/lib/mozilla-firefox-bin/libnssdbm3.chk
+# /usr/lib/mozilla-firefox-bin/removed-files
+# /usr/lib/mozilla-firefox-bin/update.locale
+# /usr/lib/mozilla-firefox-bin/updater
+# /usr/lib/mozilla-firefox-bin/updater.ini
%define realname firefox
Summary: Mozilla Firefox web browser
Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW
@@ -14,9 +32,11 @@
Patch0: %{name}-agent.patch
Patch1: %{name}-ti-agent.patch
URL: http://www.mozilla.org/projects/firefox/
+BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: zip
-Provides: wwwbrowser
+Requires: browser-plugins >= 2.0
Requires: procps
+Provides: wwwbrowser
Obsoletes: mozilla-firebird
Conflicts: mozilla-firefox
ExclusiveArch: i686 athlon
@@ -63,16 +83,31 @@
cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name}
sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} >
$RPM_BUILD_ROOT%{_bindir}/mozilla-firefox-bin
ln -s mozilla-firefox-bin $RPM_BUILD_ROOT%{_bindir}/firefox-bin
-install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install icons/mozicon128.png
$RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox-bin.png
+cp -a %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
+cp -a icons/mozicon128.png
$RPM_BUILD_ROOT%{_pixmapsdir}/mozilla-firefox-bin.png
+
+%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+%update_browser_plugins
+
+%postun
+if [ "$1" = 0 ]; then
+ %update_browser_plugins
+fi
+
%files
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/mozilla-firefox-bin
%attr(755,root,root) %{_bindir}/firefox-bin
+
+# browser plugins v2
+%{_browserpluginsconfdir}/browsers.d/%{name}.*
+%config(noreplace) %verify(not md5 mtime size)
%{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist
+
%dir %{_libdir}/%{name}
%{_libdir}/%{name}/application.ini
%{_libdir}/%{name}/platform.ini
@@ -105,6 +140,9 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.54 2010/04/07 18:27:50 glen
+- add browser plugins integration
+
Revision 1.53 2010/04/04 19:57:31 shadzik
- add agent patches
- rel 5
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.53&r2=1.54&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
