forked from pool/MozillaFirefox
Accepting request 65604 from mozilla:Factory
Accepted submit request 65604 from user coolo OBS-URL: https://build.opensuse.org/request/show/65604 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=112
This commit is contained in:
Sascha Peilicke
Git OBS Bridge
commit
deb26cd8a5
@ -1,7 +1,18 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 30 11:24:36 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- add all available icon sizes
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 29 11:55:53 UTC 2011 - cfarrell@novell.com
|
||||
|
||||
- license update: MPLv1.1 or GPLv2+ or LGPLv2+
|
||||
Sync licenses with Fedora. MPL does not state ^or later^
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 18 08:49:15 UTC 2011 - wr@rosenauer.org
|
||||
|
||||
- update to version 4.0 (rc2)
|
||||
- update to version 4.0rc2
|
||||
- fixed rpm macros delivered with devel package (bnc#679950)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
|
||||
@ -24,7 +24,7 @@
|
||||
Name: MozillaFirefox
|
||||
%define use_xulrunner 1
|
||||
%define xulrunner mozilla-xulrunner20
|
||||
BuildRequires: Mesa-devel autoconf213 fdupes gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files yasm zip
|
||||
BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa-devel yasm
|
||||
%if %suse_version > 1110
|
||||
BuildRequires: libiw-devel
|
||||
%else
|
||||
@ -33,7 +33,7 @@ BuildRequires: wireless-tools
|
||||
%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
|
||||
Provides: web_browser
|
||||
@ -68,6 +68,7 @@ Patch9: firefox-libxulsdk-locales.patch
|
||||
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 @@ compliance and performance. Its functionality can be enhanced via a
|
||||
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}
|
||||
@ -121,10 +122,9 @@ Requires: perl(Archive::Zip)
|
||||
Development files for Firefox to make packaging of addons easier.
|
||||
|
||||
%if %localize
|
||||
|
||||
%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 +136,7 @@ of MozillaFirefox.
|
||||
|
||||
%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 +148,7 @@ of MozillaFirefox.
|
||||
%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 +191,7 @@ install -m 644 %{SOURCE6} browser/app/profile/kde.js
|
||||
%patch10 -p1
|
||||
%patch11 -p1
|
||||
%patch12 -p1
|
||||
%patch13 -p1
|
||||
|
||||
%build
|
||||
export MOZ_BUILD_DATE=%{releasedate}
|
||||
@ -314,7 +315,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/pixmaps/
|
||||
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
|
||||
@ -446,7 +447,6 @@ exit 0
|
||||
%config /etc/rpm/macros.%{progname}
|
||||
|
||||
%if %localize
|
||||
|
||||
%files translations-common -f %{_tmppath}/translations.common
|
||||
%defattr(-,root,root)
|
||||
%dir %{progdir}
|
||||
|
||||
77
firefox-branded-icons.patch
Normal file
77
firefox-branded-icons.patch
Normal file
@ -0,0 +1,77 @@
|
||||
# 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/testpilot@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)
|
||||
Loading…
Reference in New Issue
Block a user