From 388c0795e82368359f14c341e045c72d4bd39fc6de38f3c0be21648d425ab2c7 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 6 Oct 2008 15:34:24 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=40 --- MozillaFirefox.changes | 5 +++ MozillaFirefox.spec | 88 +++++++++++++++++++++--------------------- 2 files changed, 48 insertions(+), 45 deletions(-) diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes index 4a3e886..f0b1edf 100644 --- a/MozillaFirefox.changes +++ b/MozillaFirefox.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Oct 6 14:55:48 CEST 2008 - sbrabec@suse.cz + +- Conflict with other branding providers (FATE#304881). + ------------------------------------------------------------------- Mon Sep 29 12:27:43 CDT 2008 - maw@suse.de diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec index 90868f2..24e3a60 100644 --- a/MozillaFirefox.spec +++ b/MozillaFirefox.spec @@ -27,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.3 -Release: 1 +Release: 2 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -71,11 +71,9 @@ Requires: %{name}-branding >= 3.0 ### build options end %description -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. +Mozilla Firefox is a standalone web browser, designed for standards +compliance and performance. Its functionality can be enhanced via a +plethora of extensions. @@ -89,7 +87,7 @@ Authors: Summary: Translations for MozillaFirefox License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) Provides: locale(%{name}:af;ar;be;bn_IN;ca;cs;da;de;el;en_GB;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;mk;mn;mr;nb_NO;nl;nn_NO;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW) -Group: Productivity/Networking/Web/Browsers +Group: System/Localization PreReq: %{name} = %{version} Requires: mozilla-xulrunner190-translations @@ -105,28 +103,25 @@ Authors: %endif -%package branding-upstream +%package branding-upstream License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL) -Summary: Mozilla Firefox Web Browser +Summary: Upstream branding for MozillaFirefox Group: Productivity/Networking/Web/Browsers -Provides: %{name}-branding = %{version} -Supplements: packageand(%{name}:branding-upstream) -#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 +Provides: %{name}-branding = %{version} +Conflicts: otherproviders(MozillaFirefox-branding) +Supplements: packageand(%{name}:branding-upstream) +#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. +%description branding-upstream +This package provides upstream look and feel for MozillaFirefox. @@ -366,7 +361,10 @@ fi %{progdir}/browserconfig.properties %{progdir}/defaults/profile/bookmarks.html %{progdir}/defaults/preferences/firefox-build.js + %changelog +* Mon Oct 06 2008 sbrabec@suse.cz +- Conflict with other branding providers (FATE#304881). * Mon Sep 29 2008 maw@suse.de - Review and approve changes. * Mon Sep 29 2008 maw@suse.de @@ -387,7 +385,7 @@ fi - brought man-page up to date for the firefox stub (removing firefox-bin reference) - en-US locale not longer packaged in translations subpackage -* Fri Aug 15 2008 maw@novell.com +* Sat Aug 16 2008 maw@novell.com - Review and approve changes. * Mon Aug 04 2008 wr@rosenauer.org - Tweak branding split @@ -418,9 +416,9 @@ fi - network.protocol-handler.app.* prefs are no longer supported; remove references to them from firefox-suse-default-prefs.js (bnc#383697). -* Wed Apr 02 2008 maw@suse.de +* Thu Apr 03 2008 maw@suse.de - Update to Firefox 3.0b5 (2.9.95) (thanks, Wolfgang). -* Tue Mar 25 2008 maw@suse.de +* 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): + Based upon the Gecko 1.9 Web rendering platform, which improves @@ -530,7 +528,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). -* Tue Dec 04 2007 maw@suse.de +* Wed Dec 05 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): @@ -545,7 +543,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. -* Thu Oct 18 2007 maw@suse.de +* Fri Oct 19 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 @@ -558,7 +556,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). -* Fri Sep 14 2007 maw@suse.de +* Sat Sep 15 2007 maw@suse.de - Update the Novell Support search plugin in search-addons.tar.bz2 (#297261) - Set the browser.tabs.loadFolderAndReplace preference to false @@ -568,7 +566,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. @@ -622,7 +620,7 @@ fi - Use mozilla.sh.in from the build service (#230681). * Tue Jun 05 2007 sbrabec@suse.cz - Removed invalid desktop category "Application" (#254654). -* Mon Jun 04 2007 maw@suse.de +* Tue Jun 05 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. @@ -634,7 +632,7 @@ fi U+3099 U+309A (see bugzilla #262718 comment #29). * Mon Mar 12 2007 maw@suse.de - Package gconf stuff. -* Wed Feb 21 2007 maw@suse.de +* Thu Feb 22 2007 maw@suse.de - Security update to 2.0.0.2 (#244923), which covers: + mfsa2007-01 * CVE-2007-0775 - layout engine crashes @@ -672,7 +670,7 @@ fi - readd MozillaFirebird provides (was incorrect in removing it). * Mon Jan 08 2007 meissner@suse.de - Do not provide MozillaFirebird, just obsolete it. -* Thu Nov 30 2006 maw@suse.de +* Fri Dec 01 2006 maw@suse.de - Update gecko-lockdown.patch (#220616). * Thu Nov 30 2006 maw@suse.de - Update firefox-suse-default-prefs.js, adding @@ -750,7 +748,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) @@ -927,7 +925,7 @@ fi - unlocalize bookmarks (#114279) * Thu Sep 08 2005 stark@suse.de - fixed some filemodes (#114849) -* Sat Sep 03 2005 stark@suse.de +* Sun Sep 04 2005 stark@suse.de - fixed gconf-backend patch to be able to use system prefs (#114054) * Thu Sep 01 2005 stark@suse.de @@ -1027,13 +1025,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 -* Thu Apr 21 2005 ro@suse.de +* Fri Apr 22 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 -* Thu Apr 14 2005 ro@suse.de +* Fri Apr 15 2005 ro@suse.de - fix problem in postinstall script * Thu Apr 14 2005 stark@suse.de - included fixed lockdown patch for NLD @@ -1178,13 +1176,13 @@ fi * Fri Oct 15 2004 stark@suse.de - inherit locale from system - fixed chrome registration -* Wed Oct 06 2004 joeshaw@suse.de +* Thu Oct 07 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) -* Sat Oct 02 2004 stark@suse.de +* Sun Oct 03 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) @@ -1217,7 +1215,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. @@ -1247,7 +1245,7 @@ fi - update to 1.0PR (aka 0.10) * Fri Sep 03 2004 stark@suse.de - added ppc64 patch -* Wed Sep 01 2004 dave@suse.de +* Thu Sep 02 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. @@ -1330,7 +1328,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)