diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index a8071d5..493bdaa 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Fri Aug 15 18:56:26 CDT 2008 - maw@novell.com + +- Review and approve changes. + +------------------------------------------------------------------- +Mon Aug 4 09:26:05 CEST 2008 - wr@rosenauer.org + +- Tweak branding split + +------------------------------------------------------------------- +Tue Jul 29 15:02:47 CEST 2008 - vuntz@novell.com + +- Create branding package (bnc#390752): + + search-addons.tar.bz2, bookmarks.html.suse and + firefox-suse-default-prefs.js will be moved to + MozillaFirefox-branding-openSUSE + + create a MozillaFirefox-branding-upstream package + ------------------------------------------------------------------- Mon Jul 28 20:54:22 CEST 2008 - mauro@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index b46dc60..3c554ca 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -2,9 +2,16 @@ # spec file for package MozillaFirefox (Version 3.0.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL Provides: web_browser Provides: firefox Version: 3.0.1 -Release: 1 +Release: 14 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -28,10 +35,8 @@ Source: firefox-%{version}-source.tar.bz2 Source1: MozillaFirefox.desktop Source3: mozilla.sh.in Source4: find-external-requires.sh -Source5: search-addons.tar.bz2 Source7: l10n-%{version}.tar.bz2 Source8: firefox-mimeinfo.xml -Source10: bookmarks.html.suse Source11: firefox48.png Source16: firefox.1 Source17: firefox-suse-default-prefs.js @@ -43,7 +48,7 @@ Patch17: firefox-appname.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: fileutils textutils /bin/sh gconf2 shared-mime-info desktop-file-utils Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{RELEASE}' mozilla-xulrunner190) -%define default_home_page http://www.opensuse.org/ +Requires: %{name}-branding >= 3.0 %define _unpackaged_files_terminate_build 0 %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE4} @@ -51,7 +56,6 @@ Requires: mozilla-xulrunner190 >= %(rpm -q --queryformat '%{VERSION}-%{REL %define releasedate 2008070400 %define progname firefox %define progdir %{_prefix}/%_lib/firefox -%define libgssapi libgssapi_krb5.so.2 %if %suse_version > 1020 %define gnome_confdir %{_sysconfdir} %define gnome_dir %{_prefix} @@ -79,9 +83,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}: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) +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +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;si;sk;sl;sq;sr;sv_SE;tr;uk;zh_CN;zh_TW) Group: Productivity/Networking/Web/Browsers PreReq: %{name} = %{version} Requires: mozilla-xulrunner190-translations @@ -92,6 +96,35 @@ of MozillaFirefox. +Authors: +-------- + Mozilla Foundation + +%package branding-upstream +License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) +Summary: Mozilla Firefox Web Browser +Group: Productivity/Networking/Web/Browsers +Provides: %{name}-branding = %{version} +Supplements: packageand(branding-upstream:%{name}) +#BRAND: Provide two files - +#BRAND: /usr/lib/firefox/browserconfig.properties that contains the +#BRAND: default homepage and some other default configuration options +#BRAND: /usr/lib/firefox/defaults/profile/bookmarks.html that contains +#BRAND: the list of default bookmarks +#BRAND: It's also possible to create a file +#BRAND: /usr/lib/firefox/defaults/preferences/firefox-$vendor.js to set +#BRAND: custom preference overrides. +#BRAND: It's also possible to drop files in /usr/lib/firefox/searchplugins + +%description branding-upstream +Mozilla Firefox, formerly known as Phoenix and Firebird, is a redesign +of the Mozilla browser component, similar to Galeon, K-Meleon and +Camino, but written using the XUL user interface language and designed +to be cross-platform. It is a stand-alone application instead of part +of the Mozilla Application Suite. + + + Authors: -------- Mozilla Foundation @@ -103,8 +136,6 @@ cd $RPM_BUILD_DIR/mozilla %patch2 %patch14 %patch17 -# custom bookmarks -cp -f %{SOURCE10} $RPM_BUILD_DIR/mozilla/browser/locales/en-US/profile/bookmarks.html %build export MOZ_BUILD_DATE=%{releasedate} @@ -177,9 +208,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/%{_datadir}/applications +mkdir -p $RPM_BUILD_ROOT%{_datadir}/applications install -m 644 %{SOURCE1} \ - $RPM_BUILD_ROOT/%{_datadir}/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 @@ -191,10 +222,9 @@ install -m 644 %{SOURCE18} \ mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ cp %{SOURCE16} $RPM_BUILD_ROOT%{_mandir}/man1/ # apply SUSE defaults -sed -e 's,RPM_VERSION,%{version}-%{release},g -s,GSSAPI,%{libgssapi},g' \ +sed -e 's,RPM_VERSION,%{version}-%{release},g' \ %{SOURCE17} > suse-default-prefs -cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-openSUSE.js +cp suse-default-prefs $RPM_BUILD_ROOT/%{progdir}/defaults/preferences/firefox-build.js rm suse-default-prefs # use correct locale for useragent cat > $RPM_BUILD_ROOT%{progdir}/defaults/preferences/firefox-l10n.js << EOF @@ -203,14 +233,6 @@ EOF ########## # ADDONS # -(cd $RPM_BUILD_ROOT%{progdir}/searchplugins ; tar xjf %{SOURCE5}) -# browserconfig.properties -sed "s;browser.startup.homepage=.*;browser.startup.homepage=%{default_home_page};g -s;browser.startup.homepage_reset=.*;browser.startup.homepage_reset=%{default_home_page};g" \ - dist/firefox/browserconfig.properties > $RPM_BUILD_ROOT%{progdir}/browserconfig.properties -cat << EOF >> $RPM_BUILD_ROOT%{progdir}/browserconfig.properties -startup.homepage_override_url=%{default_home_page} -EOF mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/ %if %milestone cp -f other-licenses/branding/firefox/mozicon128.png $RPM_BUILD_ROOT/usr/share/pixmaps/firefox.png @@ -301,13 +323,13 @@ fi %{progdir}/chrome/reporter.* %{progdir}/chrome/icons %{progdir}/components/ +%exclude %{progdir}/defaults/profile/bookmarks.html %{progdir}/defaults/ %{progdir}/extensions/ %{progdir}/icons/ %{progdir}/searchplugins/ %{progdir}/modules/ %attr(755,root,root) %{progdir}/%{progname}.sh -%{progdir}/browserconfig.properties %{progdir}/application.ini %{progdir}/firefox %{progdir}/blocklist.xml @@ -335,7 +357,23 @@ fi %defattr(-,root,root) %endif +%files branding-upstream +%defattr(-,root,root) +%{progdir}/browserconfig.properties +%{progdir}/defaults/profile/bookmarks.html +%{progdir}/defaults/preferences/firefox-build.js + %changelog +* Fri Aug 15 2008 maw@novell.com +- Review and approve changes. +* Mon Aug 04 2008 wr@rosenauer.org +- Tweak branding split +* Tue Jul 29 2008 vuntz@novell.com +- Create branding package (bnc#390752): + + search-addons.tar.bz2, bookmarks.html.suse and + firefox-suse-default-prefs.js will be moved to + MozillaFirefox-branding-openSUSE + + create a MozillaFirefox-branding-upstream package * Mon Jul 28 2008 mauro@suse.de - Update to stability/security release 3.0.1 (bnc#407573) (thanks, Wolfgang) @@ -357,9 +395,9 @@ fi - network.protocol-handler.app.* prefs are no longer supported; remove references to them from firefox-suse-default-prefs.js (bnc#383697). -* Thu Apr 03 2008 maw@suse.de +* Wed Apr 02 2008 maw@suse.de - Update to Firefox 3.0b5 (2.9.95) (thanks, Wolfgang). -* Wed Mar 26 2008 maw@suse.de +* Tue Mar 25 2008 maw@suse.de - Merge changes from the build service (thanks, Wolfgang) - Update to the fourth Firefox 3.0 Beta (2.9.94): + Based upon the Gecko 1.9 Web rendering platform, which improves @@ -469,7 +507,7 @@ fi - Add mozilla-maxpathlen.patch (#354150 and bmo #412610). * Fri Dec 21 2007 maw@suse.de - Add firefox-348446-empty-lists.patch (bnc#348446). -* Wed Dec 05 2007 maw@suse.de +* Tue Dec 04 2007 maw@suse.de - Respin proxy-dev.patch (bnc#340678) -- thanks, Anders! * Tue Nov 27 2007 maw@suse.de - Security update to version 2.0.0.10 (#341905, #341591): @@ -484,7 +522,7 @@ fi - Build with -ftree-vrp -fwrapv, per advice in #342603#c17. * Tue Nov 13 2007 maw@suse.de - Add firefox-gcc4.3-fixes.patch. -* Fri Oct 19 2007 maw@suse.de +* Thu Oct 18 2007 maw@suse.de - Security update to version 2.0.0.8 (#332512) (thanks, Wolfgang) * MFSA 2007-29 Crashes with evidence of memory corruption * MFSA 2007-30 onUnload Tailgating @@ -497,7 +535,7 @@ fi http://www.mozilla.org/projects/security/known-vulnerabilities.html * Sun Sep 23 2007 maw@suse.de - Don't explicitly require libaoss.so (#326751). -* Sat Sep 15 2007 maw@suse.de +* Fri Sep 14 2007 maw@suse.de - Update the Novell Support search plugin in search-addons.tar.bz2 (#297261) - Set the browser.tabs.loadFolderAndReplace preference to false @@ -507,7 +545,7 @@ fi * Thu Sep 06 2007 maw@suse.de - Add http://software.opensuse.org/search?baseproject=openSUSE:10.3 to the default bookmarks (#308223). -* Tue Sep 04 2007 ro@suse.de +* Mon Sep 03 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. @@ -561,7 +599,7 @@ fi - Use mozilla.sh.in from the build service (#230681). * Tue Jun 05 2007 sbrabec@suse.cz - Removed invalid desktop category "Application" (#254654). -* Tue Jun 05 2007 maw@suse.de +* Mon Jun 04 2007 maw@suse.de - Security update to version 2.0.0.4 - Refresh configure.patch, startup.patch, and visibility.patch - Now use l10n-%%{version}.tar.bz2 instead of l10n.tar.bz2. @@ -573,7 +611,7 @@ fi U+3099 U+309A (see bugzilla #262718 comment #29). * Mon Mar 12 2007 maw@suse.de - Package gconf stuff. -* Thu Feb 22 2007 maw@suse.de +* Wed Feb 21 2007 maw@suse.de - Security update to 2.0.0.2 (#244923), which covers: + mfsa2007-01 * CVE-2007-0775 - layout engine crashes @@ -611,7 +649,7 @@ fi - readd MozillaFirebird provides (was incorrect in removing it). * Mon Jan 08 2007 meissner@suse.de - Do not provide MozillaFirebird, just obsolete it. -* Fri Dec 01 2006 maw@suse.de +* Thu Nov 30 2006 maw@suse.de - Update gecko-lockdown.patch (#220616). * Thu Nov 30 2006 maw@suse.de - Update firefox-suse-default-prefs.js, adding @@ -689,7 +727,7 @@ fi * Thu Jun 29 2006 stark@suse.de - fixed printing crash if the last used printer is not available anymore (#187013) -* Sat Jun 17 2006 stark@suse.de +* Fri Jun 16 2006 stark@suse.de - added 48x48 icon (#185777) * Mon Jun 12 2006 stark@suse.de - fix overwrite confirmation for GTK filesaver (#179531) @@ -866,7 +904,7 @@ fi - unlocalize bookmarks (#114279) * Thu Sep 08 2005 stark@suse.de - fixed some filemodes (#114849) -* Sun Sep 04 2005 stark@suse.de +* Sat Sep 03 2005 stark@suse.de - fixed gconf-backend patch to be able to use system prefs (#114054) * Thu Sep 01 2005 stark@suse.de @@ -966,13 +1004,13 @@ fi * Sat Apr 23 2005 stark@suse.de - activate usage of system NSPR for distributions after 9.3 - add patch to be able to use systen NSPR at all -* Fri Apr 22 2005 ro@suse.de +* Thu Apr 21 2005 ro@suse.de - use mozilla-gcc4.patch * Thu Apr 21 2005 stark@suse.de - don't execute gconf magic within build environment * Sat Apr 16 2005 stark@suse.de - update to final 1.0.3 release -* Fri Apr 15 2005 ro@suse.de +* Thu Apr 14 2005 ro@suse.de - fix problem in postinstall script * Thu Apr 14 2005 stark@suse.de - included fixed lockdown patch for NLD @@ -1117,13 +1155,13 @@ fi * Fri Oct 15 2004 stark@suse.de - inherit locale from system - fixed chrome registration -* Thu Oct 07 2004 joeshaw@suse.de +* Wed Oct 06 2004 joeshaw@suse.de - disable gconf settings as default (Ximian #67718) * Wed Oct 06 2004 stark@suse.de - fixed inclusion of RealPlayer plugin again * Tue Oct 05 2004 stark@suse.de - small important fix in firefox-download.patch (Ximian #65472) -* Sun Oct 03 2004 stark@suse.de +* Sat Oct 02 2004 stark@suse.de - added security-fix from 0.10.1 (mozilla.org #259708) (#46687) * Fri Oct 01 2004 stark@suse.de - final fix for downloading to Desktop folder (Ximian #65756) @@ -1156,7 +1194,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 -* Tue Sep 21 2004 joeshaw@suse.de +* Mon Sep 20 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. @@ -1186,7 +1224,7 @@ fi - update to 1.0PR (aka 0.10) * Fri Sep 03 2004 stark@suse.de - added ppc64 patch -* Thu Sep 02 2004 dave@suse.de +* Wed Sep 01 2004 dave@suse.de - Fixed up the .desktop installation on nld * Wed Sep 01 2004 shprasad@suse.de - Doesn't ask to set Firefox as default web-browser. @@ -1269,7 +1307,7 @@ fi - build as user * Fri Aug 22 2003 stark@suse.de - upstream sync for 0.6.1post -* Mon Aug 11 2003 stark@suse.de +* Sun Aug 10 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/bookmarks.html.suse b/bookmarks.html.suse deleted file mode 100644 index bc1ab84..0000000 --- a/bookmarks.html.suse +++ /dev/null @@ -1,40 +0,0 @@ - - - -Bookmarks -

Bookmarks

- -

-

Get Bookmark Add-ons -
-

Bookmarks Toolbar Folder

-
Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar -

-

openSUSE

-

-

openSUSE -
openSUSE Download -
openSUSE News -
How To participate in openSUSE -
openSUSE Forums -
Planet SUSE -
Novell / Linux -
SUSE Linux Cool Solutions -
SUSE Linux Support -

-

-

Getting Started -
Latest Headlines -

-

-

Mozilla Firefox

-

-

Help and Tutorials -
Customize Firefox -
Get Involved -
About Us -

-

-

diff --git a/firefox-suse-default-prefs.js b/firefox-suse-default-prefs.js index aee18fa..ea5b082 100644 --- a/firefox-suse-default-prefs.js +++ b/firefox-suse-default-prefs.js @@ -1,19 +1,2 @@ -pref("browser.display.use_system_colors", true); -pref("general.smoothScroll", true); pref("general.useragent.vendor", "SUSE"); pref("general.useragent.vendorSub", "RPM_VERSION"); -pref("browser.link.open_external", 2); -pref("browser.startup.homepage_override.mstone", "ignore"); -pref("font.default", "sans-serif"); -pref("font.default.x-western", "sans-serif"); -pref("font.name.monospace.x-western", "monospace"); -pref("font.name.monospace.x-unicode", "monospace"); -pref("network.negotiate-auth.gsslib", "GSSAPI"); -pref("print.print_edge_top", 14); // 1/100 of an inch -pref("print.print_edge_left", 16); // 1/100 of an inch -pref("print.print_edge_right", 16); // 1/100 of an inch -pref("print.print_edge_bottom", 14); // 1/100 of an inch -pref("startup.homepage_override_url", "resource:/browserconfig.properties"); -pref("browser.backspace_action", 2); -pref("browser.tabs.loadFolderAndReplace", false); -pref("browser.shell.checkDefaultBrowser", true); diff --git a/search-addons.tar.bz2 b/search-addons.tar.bz2 deleted file mode 100644 index f95cf70..0000000 --- a/search-addons.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:3c6d1179bcea9a09caa2c9c3b894925557fe9958a5cdc76b2a87b9cf7c2b81fd -size 4712