From 0935c4c8233cec0286aeba245086283f7d3bd6ece7803ac2242a01c01c13f46e Mon Sep 17 00:00:00 2001 From: OBS User buildservice-autocommit Date: Fri, 14 Jan 2011 01:27:08 +0000 Subject: [PATCH 1/2] Updating link to change in openSUSE:Factory/MozillaFirefox revision 100.0 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=466ec3299f4666fb5c5a59cbcf831693 --- MozillaFirefox.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 47239b6..1d2a854 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 4.0b9) +# spec file for package MozillaFirefox # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -22,7 +22,7 @@ Name: MozillaFirefox %define use_xulrunner 1 %define xulrunner mozilla-xulrunner20 -BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm +BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip %if %suse_version > 1110 BuildRequires: libiw-devel %else @@ -33,9 +33,9 @@ BuildRequires: %{xulrunner}-devel = 2.0b9 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Version: 4.0b9 +Release: 1 Provides: web_browser Provides: firefox = %{version} -Release: 1 %define releasedate 2011011000 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ @@ -60,7 +60,7 @@ Patch5: firefox-kde.patch Patch6: firefox-ui-lockdown.patch Patch7: firefox-no-sync-l10n.patch Patch8: firefox-libxulsdk-locales.patch -Patch9: firefox-no-default-ualocale.patch +Patch9: firefox-no-default-ualocale.patch Patch10: firefox-multilocale-chrome.patch Patch11: firefox-shell-bmo624267.patch Patch12: firefox-shellservice.patch @@ -105,6 +105,7 @@ plethora of extensions. %if %localize + %package translations-common Summary: Common translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ From 63f9e21cb7fc9725bb42aad317fb5279290190db243bd062187ede36bc743c39 Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Mon, 24 Jan 2011 09:14:26 +0000 Subject: [PATCH 2/2] 4.0b10 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=184 --- MozillaFirefox.changes | 9 ++++ MozillaFirefox.spec | 38 +++++++++------ compare-locales.tar.bz2 | 4 +- firefox-4.0b10-source.tar.bz2 | 3 ++ firefox-4.0b9-source.tar.bz2 | 3 -- firefox-kde.patch | 24 ++++++---- firefox-multilocale-chrome.patch | 15 +++--- firefox-shell-bmo624267.patch | 82 -------------------------------- l10n-4.0b10.tar.bz2 | 3 ++ l10n-4.0b9.tar.bz2 | 3 -- 10 files changed, 64 insertions(+), 120 deletions(-) create mode 100644 firefox-4.0b10-source.tar.bz2 delete mode 100644 firefox-4.0b9-source.tar.bz2 delete mode 100644 firefox-shell-bmo624267.patch create mode 100644 l10n-4.0b10.tar.bz2 delete mode 100644 l10n-4.0b9.tar.bz2 diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index f958f79..e151d61 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sat Jan 22 22:21:52 UTC 2011 - wr@rosenauer.org + +- update to version 4.0b10 +- removed obsolete firefox-shell-bmo624267.patch +- testpilot moved to distribution/extensions +- updated locale provides and removed bn-IN from locales +- use new macros for desktop file and icon registration + ------------------------------------------------------------------- Tue Jan 11 06:13:40 UTC 2011 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 1d2a854..ab085e4 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox +# spec file for package MozillaFirefox (Version 4.0b10) # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2011 Wolfgang Rosenauer @@ -22,21 +22,21 @@ Name: MozillaFirefox %define use_xulrunner 1 %define xulrunner mozilla-xulrunner20 -BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm %if %suse_version > 1110 BuildRequires: libiw-devel %else BuildRequires: wireless-tools %endif %if 0%{?use_xulrunner} -BuildRequires: %{xulrunner}-devel = 2.0b9 +BuildRequires: %{xulrunner}-devel = 2.0b10 %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 4.0b9 -Release: 1 +Version: 4.0b10 Provides: web_browser Provides: firefox = %{version} -%define releasedate 2011011000 +Release: 1 +%define releasedate 2011012100 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -62,8 +62,7 @@ Patch7: firefox-no-sync-l10n.patch Patch8: firefox-libxulsdk-locales.patch Patch9: firefox-no-default-ualocale.patch Patch10: firefox-multilocale-chrome.patch -Patch11: firefox-shell-bmo624267.patch -Patch12: firefox-shellservice.patch +Patch11: firefox-shellservice.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils @@ -105,7 +104,6 @@ plethora of extensions. %if %localize - %package translations-common Summary: Common translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ @@ -121,7 +119,7 @@ of MozillaFirefox. %package translations-other Summary: Extra translations for MozillaFirefox License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) +Provides: locale(%{name}:af;ak;ast;be;bg;bn_BD;br;cy;el;en_ZA;eo;et;eu;fy_NL;ga_IE;gd;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;kn;ku;lg;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk) Group: System/Localization Requires: %{name} = %{version} Obsoletes: %{name}-translations < %{version}-%{release} @@ -173,7 +171,6 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js %patch9 -p1 %patch10 -p1 %patch11 -p1 -%patch12 -p1 %build export MOZ_BUILD_DATE=%{releasedate} @@ -243,7 +240,7 @@ rm -f %{_tmppath}/translations.* touch %{_tmppath}/translations.{common,other} for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do case $locale in - ja-JP-mac|en-US) + ja-JP-mac|en-US|bn-IN) ;; *) pushd $RPM_BUILD_DIR/compare-locales @@ -320,26 +317,40 @@ rm -rf %{_tmppath}/translations.* %post # update mime and desktop database +%if %suse_version > 1130 +%mime_database_post +%desktop_database_post +%icon_theme_cache_post +%else if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : fi if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null || : fi +%endif exit 0 %postun +%if %suse_version > 1130 +%icon_theme_cache_postun +%desktop_database_postun +%mime_database_postun +%else if [ -f usr/bin/update-mime-database ] ; then usr/bin/update-mime-database %{_datadir}/mime > /dev/null || : fi if [ -f usr/bin/update-desktop-database ] ; then usr/bin/update-desktop-database > /dev/null || : fi +%endif +exit 0 %files %defattr(-,root,root) %dir %{progdir} %dir %{progdir}/chrome/ +%dir %{progdir}/distribution/ %{progdir}/chrome/browser.* %{progdir}/chrome/localized.manifest %{progdir}/chrome/nonlocalized.manifest @@ -349,7 +360,7 @@ fi %exclude %{progdir}/defaults/profile/bookmarks.html %{progdir}/defaults/ %dir %{progdir}/extensions/ -%{progdir}/extensions/testpilot@labs.mozilla.com +%{progdir}/distribution/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ %{progdir}/modules/ @@ -372,7 +383,6 @@ fi %doc %{_mandir}/man1/%{progname}.1.gz %if %localize - %files translations-common -f %{_tmppath}/translations.common %defattr(-,root,root) %dir %{progdir} diff --git a/compare-locales.tar.bz2 b/compare-locales.tar.bz2 index b71ba95..d17a059 100644 --- a/compare-locales.tar.bz2 +++ b/compare-locales.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ac0cc69db526ffba2445d7d75927641e3be89667d1d8f5cd7d6966406d1fb6e1 -size 23421 +oid sha256:ce16a17951d11c7e2f71295d2157bb2c629be8bacdcf5647009882853c1278ca +size 23437 diff --git a/firefox-4.0b10-source.tar.bz2 b/firefox-4.0b10-source.tar.bz2 new file mode 100644 index 0000000..0f35377 --- /dev/null +++ b/firefox-4.0b10-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:2755ab185e80436ba03a3a225d86f0bc8f0293de583b665635c8b7294732f2b1 +size 64278065 diff --git a/firefox-4.0b9-source.tar.bz2 b/firefox-4.0b9-source.tar.bz2 deleted file mode 100644 index 8bb6510..0000000 --- a/firefox-4.0b9-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:5aeed5bfa6bcb4743d69d1ffc7efa511840df819b8106df39b914c8e7ba961f8 -size 63999667 diff --git a/firefox-kde.patch b/firefox-kde.patch index f591bfb..1dbb55c 100644 --- a/firefox-kde.patch +++ b/firefox-kde.patch @@ -23,7 +23,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1058 @@ +@@ -0,0 +1,1062 @@ +#filter substitution + +# -*- Mode: HTML -*- @@ -569,6 +569,7 @@ new file mode 100644 + onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'" + onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);"> +