Accepting request 74180 from mozilla:Factory

fix build

OBS-URL: https://build.opensuse.org/request/show/74180
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=120

MozillaFirefox.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Mon Jun 20 09:17:42 UTC 2011 - wr@rosenauer.org
+
+- update to 5.0b7
+  * updated supported locales
+- do not build dump_syms static (not needed for us)
+  -> fix build for openSUSE 12.1 and above
+
 -------------------------------------------------------------------
 Wed Jun 15 14:59:32 UTC 2011 - wr@rosenauer.org
 

MozillaFirefox.spec

@@ -22,7 +22,7 @@
 %define mainver %major.99
 
 Name:           MozillaFirefox
-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
 BuildRequires:  libproxy-devel
@@ -34,8 +34,8 @@ BuildRequires:  mozilla-nss-devel >= 3.12.8
 BuildRequires:  nss-shared-helper-devel
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Version:        %{mainver}
-Release:        3
+Release:        1
-%define         releasedate 2011061300
+%define         releasedate 2011061400
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -73,6 +73,7 @@ Patch9:         mozilla-cairo-return.patch
 Patch10:        mozilla-ntlm-full-path.patch
 Patch11:        mozilla-ppc-ipc.patch
 Patch12:        mozilla-repo.patch
+Patch13:        mozilla-dump_syms-static.patch
 # Firefox/browser
 Patch30:        firefox-linkorder.patch
 Patch31:        firefox-browser-css.patch
@@ -131,7 +132,6 @@ 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:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -147,7 +147,7 @@ of MozillaFirefox.
 %package translations-other
 Summary:        Extra translations for MozillaFirefox
 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)
+Provides:       locale(%{name}:af;ak;ast;be;bg;bn_BD;bn_IN;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;vi;zu)
 Group:          System/Localization
 Requires:       %{name} = %{version}
 Obsoletes:      %{name}-translations < %{version}-%{release}
@@ -179,7 +179,6 @@ This package provides upstream look and feel for MozillaFirefox.
 
 
 %if %crashreporter
-
 %package buildsymbols
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Summary:        Breakpad buildsymbols for %{name}
@@ -190,6 +189,7 @@ This subpackage contains the Breakpad created and compatible debugging
 symbols meant for upload to Mozilla's crash collector database.
 %endif
 
+
 %prep
 %setup -q -n mozilla -b 7 -b 10
 cd $RPM_BUILD_DIR/mozilla
@@ -205,6 +205,7 @@ cd $RPM_BUILD_DIR/mozilla
 %patch10 -p1
 %patch11 -p1
 %patch12 -p1
+%patch13 -p1
 #
 %patch30 -p1
 %patch31 -p1
@@ -320,7 +321,7 @@ rm -f %{_tmppath}/translations.*
 touch %{_tmppath}/translations.{common,other}
 for locale in $(awk '{ print $1; }' ../mozilla/browser/locales/shipped-locales); do
   case $locale in
-   ja-JP-mac|en-US|bn-IN)
+   ja-JP-mac|en-US)
 	;;
    *)
    	pushd $RPM_BUILD_DIR/compare-locales
@@ -535,7 +536,6 @@ exit 0
 %config /etc/rpm/macros.%{progname}
 
 %if %localize
-
 %files translations-common -f %{_tmppath}/translations.common
 %defattr(-,root,root)
 %dir %{progdir}
@@ -554,7 +554,6 @@ exit 0
 #%{progdir}/defaults/profile/bookmarks.html
 
 %if %crashreporter
-
 %files buildsymbols
 %defattr(-,root,root)
 %{_datadir}/mozilla/*.zip

compare-locales.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5f2e1fe0f5ce14a07cc6a0595ec24d67e68a5271c9ad18da9c1a7d7e60ab7644
+oid sha256:d75b5963522398528102263d8da2d57d5eadae3611853b74f58728605a8e69be
 size 25677

create-tar.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 BRANCH="mozilla-beta"
-RELEASE_TAG="FIREFOX_5_0b6_RELEASE"
+RELEASE_TAG="FIREFOX_5_0b7_RELEASE"
 VERSION="4.99"
 
 # mozilla

firefox-4.99-source.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:97703ac719827e5e1c670950cf15a696103f45c59175ddd9efc80b65fa9c07e9
+oid sha256:887d410a35fb4583e0cf6c469a3a076c3d312d0014086af7ecb727d3b2003fd0
-size 68753391
+size 68757199

l10n-4.99.tar.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:4cc25d59f5b7aac22af85eed87bda619ee7075333a5d1344c880934a10aa26a7
+oid sha256:4f4f7a156e88171389beba130f56353f7801803670b7b640eb430d491d852573
-size 43092043
+size 43094243

mozilla-dump_syms-static.patch

@@ -0,0 +1,20 @@
+# HG changeset patch
+# Parent e589abb2c4d6aaa6083d254416211ac90360dbdd
+NO-BUG: Ignore a hack which is not needed in distribution build environments.
+
+diff --git a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+--- a/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
++++ b/toolkit/crashreporter/google-breakpad/src/tools/linux/dump_syms/Makefile.in
+@@ -59,11 +59,11 @@ HOST_LIBS += \
+   $(NULL)
+ 
+ # force C++ linking
+ CPP_PROG_LINK = 1
+ FORCE_USE_PIC = 1
+ 
+ #XXX: bug 554854 causes us to be unable to run binaries on the build slaves
+ # due to them having an older libstdc++
+-HOST_LDFLAGS += -static
++#HOST_LDFLAGS += -static
+ 
+ include $(topsrcdir)/config/rules.mk

mozilla-repo.patch

@@ -1,6 +1,28 @@
 # HG changeset patch
 # Parent 84ecc6172ec5f01c80346bdb819520d08f982bac
 
+diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
+--- a/browser/app/Makefile.in
++++ b/browser/app/Makefile.in
+@@ -67,17 +67,17 @@ GRE_BUILDID = $(shell $(PYTHON) $(topsrc
+ 
+ DEFINES += -DGRE_MILESTONE=$(GRE_MILESTONE) -DGRE_BUILDID=$(GRE_BUILDID)
+ 
+ MOZ_SOURCE_STAMP ?= $(shell hg -R $(topsrcdir) parent --template="{node|short}\n" 2>/dev/null)
+ ifdef MOZ_SOURCE_STAMP
+ DEFINES += -DMOZ_SOURCE_STAMP="$(MOZ_SOURCE_STAMP)"
+ endif
+ 
+-SOURCE_REPO := $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
++SOURCE_REPO ?= $(shell hg -R $(topsrcdir) showconfig paths.default 2>/dev/null | sed -e "s/^ssh:/http:/")
+ ifdef SOURCE_REPO
+ DEFINES += -DMOZ_SOURCE_REPO="$(SOURCE_REPO)"
+ endif
+ 
+ LIBS += $(JEMALLOC_LIBS)
+ 
+ ifdef LIBXUL_SDK
+ include $(topsrcdir)/config/rules.mk
 diff --git a/toolkit/content/Makefile.in b/toolkit/content/Makefile.in
 --- a/toolkit/content/Makefile.in
 +++ b/toolkit/content/Makefile.in

source-stamp.txt

@@ -1,2 +1,2 @@
-REV=937762949167
+REV=3fb6ad7c725e
 REPO=http://hg.mozilla.org/mozilla-beta