diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index f9147d0..4e35d32 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,15 @@ +------------------------------------------------------------------- +Tue Jun 17 18:49:33 CEST 2008 - maw@suse.de + +- Merge changes from the build service (thanks, Wolfgang) + (bnc#400001 and SWAMP#18164). + +------------------------------------------------------------------- +Tue Jun 17 14:40:04 CEST 2008 - wr@rosenauer.org + +- update to version 3.0 +- fixed double entry in bookmarks for www.opensuse.org (bnc#396980 + ------------------------------------------------------------------- Thu May 15 13:45:51 CEST 2008 - aj@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 8b0e954..9efa29f 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 2.9.95) +# spec file for package MozillaFirefox (Version 3.0) # # 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.95 -Release: 19 +Version: 3.0 +Release: 1 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -42,13 +42,13 @@ Patch14: credits.patch Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils textutils /bin/sh gconf2 shared-mime-info desktop-file-utils -Requires: mozilla-xulrunner190 >= %( echo `rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190`) +Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) %define default_home_page http://www.opensuse.org/ %define _unpackaged_files_terminate_build 0 %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} %define __find_provides %{nil} -%define releasedate 2008032600 +%define releasedate 2008061600 %define progname firefox %define progdir %{_prefix}/%_lib/firefox %define libgssapi libgssapi_krb5.so.2 @@ -81,10 +81,10 @@ Authors: %package translations License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Summary: Translations for MozillaFirefox -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) +Provides: locale(%{name}:af;ar;be;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;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 +Requires: mozilla-xulrunner190-translations %description translations This package contains several optional languages for the user interface @@ -177,9 +177,9 @@ s:%%PROFILE:.mozilla/firefox:g" \ chmod 755 $RPM_BUILD_ROOT%{progdir}/%{progname}.sh ln -sf ../..%{progdir}/%{progname}.sh $RPM_BUILD_ROOT/usr/bin/%{progname} # desktop definition -mkdir -p $RPM_BUILD_ROOT/usr/share/applications +mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications install -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT/usr/share/applications + $RPM_BUILD_ROOT/%{_datadir}/applications # additional mime-types mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/firefox.xml @@ -194,7 +194,7 @@ cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/ sed -e 's,RPM_VERSION,%{version}-%{release},g s,GSSAPI,%{libgssapi},g' \ %{SOURCE17} > suse-default-prefs -cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-novell.js +cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-openSUSE.js rm suse-default-prefs # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF @@ -317,16 +317,17 @@ fi %exclude %{progdir}/old-homepage-default.properties %exclude %{progdir}/components/libnkgnomevfs.so %exclude %{progdir}/run-mozilla.sh +%exclude %{progdir}/libjemalloc.so %{_datadir}/applications/%{name}.desktop %if %suse_version <= 1020 %{gnome_confdir}/gconf/schemas/firefox.schemas %endif %{_datadir}/mime/packages/firefox.xml -/usr/share/pixmaps/firefox* +%{_datadir}/pixmaps/firefox* %if %milestone %{gnome_dir}/share/icons/hicolor/ %endif -/usr/bin/%{progname} +%{_bindir}/%{progname} %doc %{_mandir}/man1/firefox.1.gz %if %localize @@ -335,6 +336,12 @@ fi %endif %changelog +* Tue Jun 17 2008 maw@suse.de +- Merge changes from the build service (thanks, Wolfgang) + (bnc#400001 and SWAMP#18164). +* Tue Jun 17 2008 wr@rosenauer.org +- update to version 3.0 +- fixed double entry in bookmarks for www.opensuse.org (bnc#396980 * Thu May 15 2008 aj@suse.de - Add Planet SUSE, forums.o.o and How to participate to default URLs. diff --git a/bookmarks.html.suse b/bookmarks.html.suse index c7c7592..bc1ab84 100644 --- a/bookmarks.html.suse +++ b/bookmarks.html.suse @@ -17,7 +17,6 @@
openSUSE
openSUSE Download
openSUSE News -
openSUSE
How To participate in openSUSE
openSUSE Forums
Planet SUSE diff --git a/firefox-2.9.95-source.tar.bz2 b/firefox-2.9.95-source.tar.bz2 deleted file mode 100644 index ed02aa9..0000000 --- a/firefox-2.9.95-source.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:da9005ccd481fa398aa2788bd85f68d0e7f06c757bf8961147d96e64d455258b -size 36694978 diff --git a/firefox-3.0-source.tar.bz2 b/firefox-3.0-source.tar.bz2 new file mode 100644 index 0000000..2771d73 --- /dev/null +++ b/firefox-3.0-source.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:30eb8f6ca201bb489aeeeb5b7f235e4ab85e7641ebedde9b0bb91de2c96f02ca +size 36847008 diff --git a/l10n-2.9.95.tar.bz2 b/l10n-2.9.95.tar.bz2 deleted file mode 100644 index 98e9de0..0000000 --- a/l10n-2.9.95.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:27eef2891578dd3458019170286add117d6bbe10b1b8c1a300f390163cb5e81c -size 27627048 diff --git a/l10n-3.0.tar.bz2 b/l10n-3.0.tar.bz2 new file mode 100644 index 0000000..a1a9e78 --- /dev/null +++ b/l10n-3.0.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0b5ea52614f5bcded7249904df3e31419149d2c99ec71c494881d60d3b5f7f57 +size 28718359