diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 9f28e56e..46cf783c 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jun 18 10:19:40 CEST 2009 - wr@rosenauer.org + +- update to version 3.5rc2 (20090617) +- BuildRequire mozilla-xulrunner191 = 1.9.1.0 + ------------------------------------------------------------------- Sat Jun 6 15:59:02 CEST 2009 - wr@rosenauer.org diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 2672e2af..db956937 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.5b99) +# spec file for package MozillaFirefox (Version 3.5.0) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2006-2009 Wolfgang Rosenauer @@ -21,15 +21,15 @@ Name: MozillaFirefox BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel orbit-devel python unzip update-desktop-files zip -BuildRequires: mozilla-xulrunner191-devel = 1.9.1b99 +BuildRequires: mozilla-xulrunner191-devel = 1.9.1.0 %if %suse_version > 1020 BuildRequires: fdupes %endif -License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GPL v2 or later ; LGPL v2.1 or later ; MPL .. Provides: web_browser Provides: firefox -Version: 3.5b99 -Release: 2 +Version: 3.5.0 +Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -42,7 +42,6 @@ Source4: find-external-requires.sh Source5: firefox.schemas Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml -Source11: firefox48.png Source16: firefox.1 Source17: firefox-suse-default-prefs.js Patch1: firefox-libxul-sdk.patch @@ -64,7 +63,7 @@ Requires: %{name}-branding = 3.5 %define __find_requires sh %{SOURCE4} %global provfind sh -c "grep -v '.so' | %__find_provides" %global __find_provides %provfind -%define releasedate 2009060400 +%define releasedate 2009061700 %define progname firefox %define progdir %{_prefix}/%_lib/%{progname} %if %suse_version > 1020 @@ -83,17 +82,12 @@ compliance and performance. Its functionality can be enhanced via a plethora of extensions. - -Authors: --------- - Mozilla Foundation - %if %localize %package translations Summary: Translations for MozillaFirefox -License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Provides: locale(%{name}:af;ar;as;be;bg;bn_BD;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_CL;es_ES;ex_MX;et;eu;fa;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;hu;id;is;it;ja;ka;kk;kn;ko;ku;lt;lv;mk;ml;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;rm;ro;ru;si;sk;sl;sq;sr;sv_SE;ta;ta_LK;te;th;uk;vi;zh_CN;zh_TW) +License: GPL v2 or later ; LGPL v2.1 or later ; MPL .. +Provides: locale(%{name}:af;ar;as;be;bg;bn_BD;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_CL;es_ES;ex_MX;et;eu;fa;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;hu;id;is;it;ja;ka;kk;kn;ko;ku;lt;lv;mk;ml;mr;nb_NO;nl;nn_NO;oc;or;pa_IN;pl;pt_BR;pt_PT;rm;ro;ru;si;sk;sl;sq;sr;sv_SE;ta;ta_LK;te;th;uk;vi;zh_CN;zh_TW) Group: System/Localization PreReq: %{name} = %{version} Requires: mozilla-xulrunner191-translations @@ -102,16 +96,10 @@ Requires: mozilla-xulrunner191-translations This package contains several optional languages for the user interface of MozillaFirefox. - - -Authors: --------- - Mozilla Foundation - %endif %package branding-upstream -License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +License: GPL v2 or later ; LGPL v2.1 or later ; MPL .. Summary: Upstream branding for MozillaFirefox Group: Productivity/Networking/Web/Browsers Provides: %{name}-branding = 3.5 @@ -133,11 +121,6 @@ Supplements: packageand(%{name}:branding-upstream) This package provides upstream look and feel for MozillaFirefox. - -Authors: --------- - Mozilla Foundation - %prep %setup -q -n mozilla -b 7 cd $RPM_BUILD_DIR/mozilla @@ -246,10 +229,13 @@ EOF # mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ %if %branding -cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png -mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/ -install -m 644 %{SOURCE11} $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/48x48/apps/%{progname}.png +ln -sf %{progdir}/icons/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png ln -sf %{progname}.png $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png +for size in 16 32 48; do + mkdir -p $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/ + ln -sf %{progdir}/chrome/icons/default/default$size.png \ + $RPM_BUILD_ROOT%{gnome_dir}/share/icons/hicolor/${size}x${size}/apps/%{progname}.png +done %else cp -f $RPM_BUILD_ROOT%{progdir}/icons/mozicon50.xpm $RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.xpm %endif @@ -349,6 +335,9 @@ fi %{progdir}/defaults/profile/bookmarks.html %changelog +* Thu Jun 18 2009 wr@rosenauer.org +- update to version 3.5rc2 (20090617) +- BuildRequire mozilla-xulrunner191 = 1.9.1.0 * Sat Jun 06 2009 wr@rosenauer.org - update to version 3.5b99 (20090604) - BuildRequire mozilla-xulrunner191 = 1.9.1b99 diff --git a/firefox-3.5.0-source.tar.bz2 b/firefox-3.5.0-source.tar.bz2 new file mode 100644 index 00000000..9c3ba80c --- /dev/null +++ b/firefox-3.5.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4396451d99ff77282118303245250dc0048cf4bf5d60cdc198b6c9cf519f76b6 +size 46211105 diff --git a/firefox-3.5b99-source.tar.bz2 b/firefox-3.5b99-source.tar.bz2 deleted file mode 100644 index 8df3474a..00000000 --- a/firefox-3.5b99-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9073f32fa2ff49e2ca10eab6da2f7af60c9985864efcc11fd030def5d77ab407 -size 45620670 diff --git a/firefox48.png b/firefox48.png deleted file mode 100644 index b806fcbe..00000000 --- a/firefox48.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bab5478fce79ea10ad689b7678118c90c87649f46e232e432337db783d054006 -size 5211 diff --git a/l10n-3.5.0.tar.bz2 b/l10n-3.5.0.tar.bz2 new file mode 100644 index 00000000..506f4064 --- /dev/null +++ b/l10n-3.5.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7dece224edf4b752d26d7374d3407cc17731a1ef03ad993965cc6d0415a7db38 +size 35347723 diff --git a/l10n-3.5b99.tar.bz2 b/l10n-3.5b99.tar.bz2 deleted file mode 100644 index 149d5aa5..00000000 --- a/l10n-3.5b99.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:2b0420be21b282eebc1486080e6ba9421f4966422157739d00977969568fd887 -size 35347604