From 28137b98e6fa49f2917abacbc764267031b6dd8785660e002cd4449f0e7b7d06 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 3 Apr 2008 00:56:06 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=32 --- MozillaFirefox.changes | 5 +++++ MozillaFirefox.spec | 26 +++++++++++++++----------- firefox-2.9.94-source.tar.bz2 | 3 --- firefox-2.9.95-source.tar.bz2 | 3 +++ firefox-no-update.patch | 12 ++++++------ l10n-2.9.94.tar.bz2 | 3 --- l10n-2.9.95.tar.bz2 | 3 +++ 7 files changed, 32 insertions(+), 23 deletions(-) delete mode 100644 firefox-2.9.94-source.tar.bz2 create mode 100644 firefox-2.9.95-source.tar.bz2 delete mode 100644 l10n-2.9.94.tar.bz2 create mode 100644 l10n-2.9.95.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index fbcd0f4..7f79565 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu Apr 3 01:42:34 CEST 2008 - maw@suse.de + +- Update to Firefox 3.0b5 (2.9.95) (thanks, Wolfgang). + ------------------------------------------------------------------- Wed Mar 26 01:05:18 CET 2008 - maw@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 2ca8c88..e6e4f75 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 2.9.94) +# spec file for package MozillaFirefox (Version 2.9.95) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -19,8 +19,8 @@ BuildRequires: fdupes License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: web_browser Provides: firefox -Version: 2.9.94 -Release: 2 +Version: 2.9.95 +Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -48,7 +48,7 @@ Requires: mozilla-xulrunner190 >= %( echo `rpm -q --queryformat '%{VERSION %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %define __find_provides %{nil} -%define releasedate 2008030800 +%define releasedate 2008032600 %define progname firefox %define progdir %{_prefix}/%_lib/firefox %define libgssapi libgssapi_krb5.so.2 @@ -79,8 +79,9 @@ Authors: Mozilla Foundation %package translations +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Translations for MozillaFirefox -Provides: locale(%{name}:ar;be;ca;cs;da;de;el;en-GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gu_IN;he;hu;it;ja;ka;ko;lt;mk;nb_NO;nl;pa_IN;pl;pt_BR;pt_PT;ro;ru;sk;sq;sv_SE;tr;uk;zh_CN;zh_TW) +Provides: locale(%{name}:af;ar;be;ca;cs;da;de;el;en-GB;es_AR;es_ES;eu;fi;fr;fy_NL;gu_IN;he;hu;id;it;ja;ka;ko;ku;lt;mk;mn;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;sk;sq;sr;sv_SE;tr;uk;zh_CN;zh_TW) Group: Productivity/Networking/Web/Browsers PreReq: %{name} = %{version} Requires: mozilla-xulrunner190-lang @@ -309,14 +310,14 @@ fi %{progdir}/browserconfig.properties %{progdir}/application.ini %{progdir}/firefox +%{progdir}/blocklist.xml %exclude %{progdir}/updater.ini %exclude %{progdir}/removed-files %exclude %{progdir}/README.txt %exclude %{progdir}/old-homepage-default.properties %exclude %{progdir}/components/libnkgnomevfs.so %exclude %{progdir}/run-mozilla.sh -%exclude %{progdir}/libjemalloc.so -/usr/share/applications/%{name}.desktop +%{_datadir}/applications/%{name}.desktop %if %suse_version <= 1020 %{gnome_confdir}/gconf/schemas/firefox.schemas %endif @@ -332,7 +333,10 @@ fi %files translations -f %{_tmppath}/translations.list %defattr(-,root,root) %endif + %changelog +* Thu Apr 03 2008 maw@suse.de +- Update to Firefox 3.0b5 (2.9.95) (thanks, Wolfgang). * Wed Mar 26 2008 maw@suse.de - Merge changes from the build service (thanks, Wolfgang) - Update to the fourth Firefox 3.0 Beta (2.9.94): @@ -481,7 +485,7 @@ fi * Thu Sep 06 2007 maw@suse.de - Add http://software.opensuse.org/search?baseproject=openSUSE:10.3 to the default bookmarks (#308223). -* Mon Sep 03 2007 ro@suse.de +* Tue Sep 04 2007 ro@suse.de - move last change a bit further in specfile * Fri Aug 31 2007 maw@suse.de - Mark a .png file as nonexecutable. @@ -663,7 +667,7 @@ fi * Thu Jun 29 2006 stark@suse.de - fixed printing crash if the last used printer is not available anymore (#187013) -* Fri Jun 16 2006 stark@suse.de +* Sat Jun 17 2006 stark@suse.de - added 48x48 icon (#185777) * Mon Jun 12 2006 stark@suse.de - fix overwrite confirmation for GTK filesaver (#179531) @@ -1130,7 +1134,7 @@ fi - throbber linked to Novell (Ximian #66283) by rganesan@novell.com - make industrial the default theme for NLD (Ximian #65542) by joeshaw@suse.de -* Mon Sep 20 2004 joeshaw@suse.de +* Tue Sep 21 2004 joeshaw@suse.de - Add default bookmarks. Ximian #65546. - Add the industrial theme, but it's not the default yet. - Remove acroread from add-plugins because it's badly behaved. @@ -1243,7 +1247,7 @@ fi - build as user * Fri Aug 22 2003 stark@suse.de - upstream sync for 0.6.1post -* Sun Aug 10 2003 stark@suse.de +* Mon Aug 11 2003 stark@suse.de - removed dmoz from searchplugins-filelist * Fri Aug 08 2003 stark@suse.de - update to 0.6.1post (TRUNK) diff --git a/firefox-2.9.94-source.tar.bz2 b/firefox-2.9.94-source.tar.bz2 deleted file mode 100644 index 00c5f19..0000000 --- a/firefox-2.9.94-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2098d8bad5e527fd631d94d35c91b655222c06c09f0ad73349ed96867b37766e -size 36208890 diff --git a/firefox-2.9.95-source.tar.bz2 b/firefox-2.9.95-source.tar.bz2 new file mode 100644 index 0000000..ed02aa9 --- /dev/null +++ b/firefox-2.9.95-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:da9005ccd481fa398aa2788bd85f68d0e7f06c757bf8961147d96e64d455258b +size 36694978 diff --git a/firefox-no-update.patch b/firefox-no-update.patch index 6a76420..36ee9e2 100644 --- a/firefox-no-update.patch +++ b/firefox-no-update.patch @@ -123,16 +123,16 @@ diff -u -p -r1.252 firefox.js Index: browser/components/safebrowsing/content/report-phishing-overlay.xul =================================================================== RCS file: /cvsroot/mozilla/browser/components/safebrowsing/content/report-phishing-overlay.xul,v -retrieving revision 1.11 -diff -u -p -6 -r1.11 report-phishing-overlay.xul ---- browser/components/safebrowsing/content/report-phishing-overlay.xul 26 Feb 2008 19:31:44 -0000 1.11 -+++ browser/components/safebrowsing/content/report-phishing-overlay.xul 10 Mar 2008 23:42:27 -0000 +retrieving revision 1.12 +diff -u -p -6 -r1.12 report-phishing-overlay.xul +--- browser/components/safebrowsing/content/report-phishing-overlay.xul 4 Mar 2008 16:05:13 -0000 1.12 ++++ browser/components/safebrowsing/content/report-phishing-overlay.xul 27 Mar 2008 21:52:53 -0000 @@ -47,13 +47,13 @@