Author: shadzik Date: Sun Apr 4 03:14:05 2010 GMT Module: packages Tag: HEAD ---- Log message: - don't conflict with iceweasel (parrallel installation is now possible) - rel 2
---- Files affected: packages/mozilla-firefox-bin: mozilla-firefox-bin.desktop (1.4 -> 1.5) , mozilla-firefox-bin.sh (1.2 -> 1.3) , mozilla-firefox-bin.spec (1.49 -> 1.50) ---- Diffs: ================================================================ Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.desktop diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.desktop:1.4 packages/mozilla-firefox-bin/mozilla-firefox-bin.desktop:1.5 --- packages/mozilla-firefox-bin/mozilla-firefox-bin.desktop:1.4 Thu Dec 10 06:43:35 2009 +++ packages/mozilla-firefox-bin/mozilla-firefox-bin.desktop Sun Apr 4 05:14:00 2010 @@ -3,7 +3,7 @@ Name[pl]=Mozilla Firefox GenericName=Web Browser GenericName[pl]=Przeglądarka WWW -Exec=firefox +Exec=firefox-bin Icon=mozilla-firefox-bin Terminal=false Type=Application ================================================================ Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.sh diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.sh:1.2 packages/mozilla-firefox-bin/mozilla-firefox-bin.sh:1.3 --- packages/mozilla-firefox-bin/mozilla-firefox-bin.sh:1.2 Sat Oct 18 19:57:28 2008 +++ packages/mozilla-firefox-bin/mozilla-firefox-bin.sh Sun Apr 4 05:14:00 2010 @@ -35,7 +35,7 @@ # compreg.dat and/or chrome.rdf will screw things up if it's from an # older version. http://bugs.gentoo.org/show_bug.cgi?id=63999 for f in ~/{.,.mozilla/}firefox/*/{compreg.dat,chrome.rdf,XUL.mfasl}; do - if [[ -f ${f} && ${f} -ot /usr/bin/mozilla-firefox ]]; then + if [[ -f ${f} && ${f} -ot /usr/bin/mozilla-firefox-bin ]]; then echo "Removing ${f} leftover from older firefox" rm -f "${f}" fi ================================================================ Index: packages/mozilla-firefox-bin/mozilla-firefox-bin.spec diff -u packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.49 packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.50 --- packages/mozilla-firefox-bin/mozilla-firefox-bin.spec:1.49 Sun Apr 4 04:48:45 2010 +++ packages/mozilla-firefox-bin/mozilla-firefox-bin.spec Sun Apr 4 05:14:00 2010 @@ -4,7 +4,7 @@ Summary(pl.UTF-8): Mozilla Firefox - przeglądarka WWW Name: mozilla-firefox-bin Version: 3.6.3 -Release: 1 +Release: 2 License: MPL/LGPL Group: X11/Applications/Networking Source0: http://releases.mozilla.org/pub/mozilla.org/%{realname}/releases/%{version}/linux-i686/en-US/%{realname}-%{version}.tar.bz2 @@ -50,8 +50,8 @@ $RPM_BUILD_ROOT{%{_pixmapsdir},%{_desktopdir},%{_libdir}/%{name}} \ cp -a . $RPM_BUILD_ROOT%{_libdir}/%{name} -sed 's,@LIBDIR@,%{_libdir},' %{SOURCE2} > $RPM_BUILD_ROOT%{_bindir}/mozilla-firefox -ln -s mozilla-firefox $RPM_BUILD_ROOT%{_bindir}/firefox +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 @@ -60,8 +60,8 @@ %files %defattr(644,root,root,755) -%attr(755,root,root) %{_bindir}/mozilla-firefox -%attr(755,root,root) %{_bindir}/firefox +%attr(755,root,root) %{_bindir}/mozilla-firefox-bin +%attr(755,root,root) %{_bindir}/firefox-bin %dir %{_libdir}/%{name} %{_libdir}/%{name}/application.ini %{_libdir}/%{name}/platform.ini @@ -94,6 +94,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.50 2010/04/04 03:14:00 shadzik +- don't conflict with iceweasel (parrallel installation is now possible) +- rel 2 + Revision 1.49 2010/04/04 02:48:45 shadzik - 3.6.3 - fixes CVE-2010-1121 ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.desktop?r1=1.4&r2=1.5&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.sh?r1=1.2&r2=1.3&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mozilla-firefox-bin/mozilla-firefox-bin.spec?r1=1.49&r2=1.50&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
