Author: glen Date: Mon Jan 29 23:38:12 2007 GMT Module: SPECS Tag: AC-branch ---- Log message: - browser plugins v2; rel 3
---- Files affected: SPECS: mozilla-firefox.spec (1.160.2.6 -> 1.160.2.7) ---- Diffs: ================================================================ Index: SPECS/mozilla-firefox.spec diff -u SPECS/mozilla-firefox.spec:1.160.2.6 SPECS/mozilla-firefox.spec:1.160.2.7 --- SPECS/mozilla-firefox.spec:1.160.2.6 Sat Jan 27 12:33:14 2007 +++ SPECS/mozilla-firefox.spec Tue Jan 30 00:38:05 2007 @@ -14,7 +14,7 @@ Summary(pl): Firefox Community Edition - przeglądarka WWW Name: mozilla-firefox Version: 2.0.0.1 -Release: 2 +Release: 3 License: MPL/LGPL Group: X11/Applications/Networking Source0: ftp://ftp.mozilla.org/pub/mozilla.org/firefox/releases/%{version}/source/firefox-%{version}-source.tar.bz2 @@ -26,7 +26,7 @@ Patch3: %{name}-nopangoxft.patch Patch5: %{name}-fonts.patch # if ac rebuild is needed... -#PatchX: %{name}-ac.patch +#PatchX: %{name}-ac.patch URL: http://www.mozilla.org/projects/firefox/ %{?with_gnome:BuildRequires: GConf2-devel >= 1.2.1} BuildRequires: XFree86-devel @@ -46,11 +46,13 @@ BuildRequires: pango-devel >= 1:1.6.0 BuildRequires: perl-modules >= 5.004 BuildRequires: pkgconfig +BuildRequires: rpmbuild(macros) >= 1.356 BuildRequires: zip BuildRequires: zlib-devel >= 1.2.3 Requires(post): mktemp >= 1.5-18 Requires: %{name}-lang-resources = %{version} Requires: %{name}-libs = %{epoch}:%{version}-%{release} +Requires: browser-plugins >= 2.0 Requires: nspr >= 1:4.6.3 Requires: nss >= 1:3.11.3 Provides: wwwbrowser @@ -189,6 +191,8 @@ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir}} \ $RPM_BUILD_ROOT%{_datadir}/%{name} +%browser_plugins_add_browser %{name} -p %{_libdir}/%{name}/plugins + %{__make} -C xpinstall/packager stage-package \ DESTDIR=$RPM_BUILD_ROOT \ MOZ_PKG_APPDIR=%{_libdir}/%{name} \ @@ -214,7 +218,6 @@ ln -s ../../share/%{name}/res $RPM_BUILD_ROOT%{_libdir}/%{name}/res ln -s ../../share/%{name}/searchplugins $RPM_BUILD_ROOT%{_libdir}/%{name}/searchplugins - sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox @@ -265,6 +268,12 @@ %post %{_sbindir}/%{name}-chrome+xpcom-generate +%update_browser_plugins + +%postun +if [ "$1" = 0 ]; then + %update_browser_plugins +fi %files %defattr(644,root,root,755) @@ -272,6 +281,10 @@ %attr(755,root,root) %{_bindir}/firefox %attr(755,root,root) %{_sbindir}/%{name}-chrome+xpcom-generate +# browser plugins v2 +%{_browserpluginsconfdir}/browsers.d/%{name}.* +%config(noreplace) %verify(not md5 mtime size) %{_browserpluginsconfdir}/blacklist.d/%{name}.*.blacklist + %dir %{_libdir}/%{name}/components %attr(755,root,root) %{_libdir}/%{name}/components/*.so %{_libdir}/%{name}/components/*.js @@ -343,6 +356,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.160.2.7 2007/01/29 23:38:05 glen +- browser plugins v2; rel 3 + Revision 1.160.2.6 2007/01/27 11:33:14 hawk - s/Mozilla Firefox/Firefox Community Edition/, "Mozilla Firefox" is a registered trademark and we can't use that name ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mozilla-firefox.spec?r1=1.160.2.6&r2=1.160.2.7&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
