Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory
checked in at Thu Mar 31 11:29:59 CEST 2011.
--------
--- MozillaFirefox/MozillaFirefox.changes 2011-03-21 10:47:37.000000000
+0100
+++ /mounts/work_src_done/STABLE/MozillaFirefox/MozillaFirefox.changes
2011-03-31 08:49:51.000000000 +0200
@@ -1,0 +2,11 @@
+Wed Mar 30 11:24:36 UTC 2011 - w...@rosenauer.org
+
+- add all available icon sizes
+
+-------------------------------------------------------------------
+Tue Mar 29 11:55:53 UTC 2011 - cfarr...@novell.com
+
+- license update: MPLv1.1 or GPLv2+ or LGPLv2+
+ Sync licenses with Fedora. MPL does not state ^or later^
+
+-------------------------------------------------------------------
@@ -4 +15 @@
-- update to version 4.0 (rc2)
+- update to version 4.0rc2
calling whatdependson for head-i586
New:
----
firefox-branded-icons.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.iGBZjl/_old 2011-03-31 11:29:04.000000000 +0200
+++ /var/tmp/diff_new_pack.iGBZjl/_new 2011-03-31 11:29:04.000000000 +0200
@@ -33,9 +33,9 @@
%if 0%{?use_xulrunner}
BuildRequires: %{xulrunner}-devel = 2.0.0
%endif
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Version: %{mainver}.0
-Release: 1
+Release: 2
Provides: web_browser
Provides: firefox = %{version}-%{release}
Provides: firefox = %{mainver}
@@ -68,6 +68,7 @@
Patch10: firefox-no-default-ualocale.patch
Patch11: firefox-multilocale-chrome.patch
Patch12: firefox-shellservice.patch
+Patch13: firefox-branded-icons.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires(post): coreutils shared-mime-info desktop-file-utils
Requires(postun): shared-mime-info desktop-file-utils
@@ -109,7 +110,7 @@
plethora of extensions.
%package devel
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Devel package for Firefox
Group: Development/Tools/Other
Provides: firefox-devel = %{version}-%{release}
@@ -124,7 +125,7 @@
%package translations-common
Summary: Common translations for MozillaFirefox
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Provides:
locale(%{name}:ar;ca;cs;da;de;en_GB;es_AR;es_CL;es_ES;fi;fr;hu;it;ja;ko;nb_NO;nl;pl;pt_BR;pt_PT;ru;sv_SE;zh_CN;zh_TW)
Group: System/Localization
Requires: %{name} = %{version}
@@ -136,7 +137,7 @@
%package translations-other
Summary: Extra translations for MozillaFirefox
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Provides:
locale(%{name}:af;ak;ast;be;bg;bn_BD;br;bs;cy;el;en_ZA;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gd;gl;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;zu)
Group: System/Localization
Requires: %{name} = %{version}
@@ -148,7 +149,7 @@
%endif
%package branding-upstream
-License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
+License: MPLv1.1 or GPLv2+ or LGPLv2+
Summary: Upstream branding for MozillaFirefox
Group: Productivity/Networking/Web/Browsers
Provides: %{name}-branding = 4.0
@@ -191,6 +192,7 @@
%patch10 -p1
%patch11 -p1
%patch12 -p1
+%patch13 -p1
%build
export MOZ_BUILD_DATE=%{releasedate}
@@ -314,7 +316,7 @@
ln -sf %{progdir}/icons/mozicon128.png
$RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}.png
ln -sf %{progdir}/icons/mozicon128.png
$RPM_BUILD_ROOT/usr/share/pixmaps/%{progname}-gnome.png
%if %branding
-for size in 16 32 48; do
+for size in 16 22 24 32 48 256; 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
++++++ firefox-branded-icons.patch ++++++
# HG changeset patch
# Parent 33dfbc62844ac4883fbedb77d782a1b9ef5596c4
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in
@@ -281,16 +281,21 @@ endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/mozicon128.png $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $(DIST)/branding/document.png $(DIST)/bin/icons
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default16.png
$(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default32.png
$(DIST)/bin/chrome/icons/default
$(INSTALL) $(IFLAGS1) $(DIST)/branding/default48.png
$(DIST)/bin/chrome/icons/default
+ifdef MOZ_OFFICIAL_BRANDING
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default22.png
$(DIST)/bin/chrome/icons/default
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default24.png
$(DIST)/bin/chrome/icons/default
+ $(INSTALL) $(IFLAGS1) $(DIST)/branding/default256.png
$(DIST)/bin/chrome/icons/default
+endif
endif
ifdef MOZ_SPLASHSCREEN
ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
libs::
$(INSTALL) $(IFLAGS1) $(DIST)/branding/splash.bmp $(DIST)/bin
endif
endif
diff --git a/browser/installer/package-manifest.in
b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -423,18 +423,21 @@
#if MOZ_UPDATE_CHANNEL == beta
@BINPATH@/distribution/extensions/testpi...@labs.mozilla.com.xpi
#endif
@BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest
#ifdef XP_UNIX
#ifndef XP_MACOSX
@BINPATH@/chrome/icons/default/default16.png
+@BINPATH@/chrome/icons/default/default22.png
+@BINPATH@/chrome/icons/default/default24.png
@BINPATH@/chrome/icons/default/default32.png
@BINPATH@/chrome/icons/default/default48.png
+@BINPATH@/chrome/icons/default/default256.png
#endif
#endif
; shell icons
#ifdef XP_UNIX
#ifndef XP_MACOSX
@BINPATH@/icons/*.xpm
diff --git a/other-licenses/branding/firefox/Makefile.in
b/other-licenses/branding/firefox/Makefile.in
--- a/other-licenses/branding/firefox/Makefile.in
+++ b/other-licenses/branding/firefox/Makefile.in
@@ -68,18 +68,21 @@ OSX_BRANDING_FILES = \
firefox.icns \
disk.icns \
document.icns \
dsstore \
$(NULL)
LINUX_BRANDING_FILES = \
default16.png \
+ default22.png \
+ default24.png \
default32.png \
default48.png \
+ default256.png \
document.png \
mozicon128.png \
$(NULL)
OS2_BRANDING_FILES = \
firefox-os2.ico \
document-os2.ico \
$(NULL)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
