# HG changeset patch # User Wolfgang Rosenauer # Date 1277965391 -7200 # Node ID 38ffd1ff8094972f141b8f2fded5862cebdf6447 # Parent 5a0a6f0f69abfefcc2b684e7b5cbbf496d6ecb3a Reversioning to 2.0b/4.0b (no package name change yet) Require same version of mozilla-js diff -r 5a0a6f0f69ab -r 38ffd1ff8094 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Jun 14 07:11:01 2010 +0200 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Jul 01 08:23:11 2010 +0200 @@ -1,5 +1,5 @@ # -# spec file for package MozillaFirefox (Version 3.7a) +# spec file for package MozillaFirefox (Version 4.0b) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -22,7 +22,7 @@ Name: MozillaFirefox4 %define xulrunner mozilla-xulrunner193 BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python unzip update-desktop-files zip fdupes Mesa -BuildRequires: %{xulrunner}-devel = 1.9.3a +BuildRequires: %{xulrunner}-devel = 2.0b %if %suse_version > 1110 BuildRequires: libiw-devel %else @@ -31,9 +31,9 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Provides: web_browser Provides: firefox -Version: 3.7a +Version: 4.0b Release: 1 -%define releasedate 2010060800 +%define releasedate 2010063000 Summary: Mozilla Firefox Web Browser Url: http://www.mozilla.org/ Group: Productivity/Networking/Web/Browsers @@ -119,7 +119,7 @@ License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Upstream branding for MozillaFirefox Group: Productivity/Networking/Web/Browsers -Provides: %{name}-branding = 3.7 +Provides: %{name}-branding = 4.0 Conflicts: otherproviders(%{name}-branding) Supplements: packageand(%{name}:branding-upstream) #BRAND: Provide three files - diff -r 5a0a6f0f69ab -r 38ffd1ff8094 firefox-libxul-sdk.patch --- a/firefox-libxul-sdk.patch Mon Jun 14 07:11:01 2010 +0200 +++ b/firefox-libxul-sdk.patch Thu Jul 01 08:23:11 2010 +0200 @@ -1,7 +1,12 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in --- a/browser/locales/Makefile.in +++ b/browser/locales/Makefile.in -@@ -192,9 +192,11 @@ endif +@@ -178,20 +178,22 @@ libs:: $(addsuffix .xml,$(SEARCH_PLUGINS + $(SYSINSTALL) $(IFLAGS1) $^ $(FINAL_TARGET)/searchplugins + + install:: $(addsuffix .xml,$(SEARCH_PLUGINS)) + $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/searchplugins + libs-%: $(NSINSTALL) -D $(DIST)/install @@ -9,8 +14,14 @@ @$(MAKE) -C ../../toolkit/locales libs-$* BOTH_MANIFESTS=1 + @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 +endif + @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) -C ../../extensions/reporter/locales libs AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=defaults/pref BOTH_MANIFESTS=1 @$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$* BOTH_MANIFESTS=1 - @$(MAKE) tests AB_CD=$* + + + repackage-win32-installer: WIN32_INSTALLER_OUT="$(_ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" + repackage-win32-installer: $(WIN32_INSTALLER_IN) $(SUBMAKEFILES) + @echo "Repackaging $(WIN32_INSTALLER_IN) into $(WIN32_INSTALLER_OUT)." + $(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY) export diff -r 5a0a6f0f69ab -r 38ffd1ff8094 mozilla-xulrunner193/mozilla-xulrunner193.spec --- a/mozilla-xulrunner193/mozilla-xulrunner193.spec Mon Jun 14 07:11:01 2010 +0200 +++ b/mozilla-xulrunner193/mozilla-xulrunner193.spec Thu Jul 01 08:23:11 2010 +0200 @@ -1,5 +1,5 @@ # -# spec file for package mozilla-xulrunner193 (Version 1.9.3a) +# spec file for package mozilla-xulrunner193 (Version 2.0b) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # 2006-2010 Wolfgang Rosenauer @@ -33,16 +33,16 @@ BuildRequires: wireless-tools %endif License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Version: 1.9.3a +Version: 2.0b Release: 1 -%define releasedate 2010060900 -%define version_internal 1.9.3a5pre -%define apiversion 1.9.3 -%define uaweight 192900 -Summary: Mozilla Runtime Environment 1.9.3 +%define releasedate 2010063000 +%define version_internal 2.0b2pre +%define apiversion 2.0.0 +%define uaweight 199900 +Summary: Mozilla Runtime Environment 2.0 Url: http://www.mozilla.org Group: Productivity/Other -Provides: gecko193 +Provides: gecko20 %if %suse_version >= 1110 # this is needed to match this package with the kde4 helper package without the main package # having a hard requirement on the kde4 package @@ -77,7 +77,7 @@ Patch14: mozilla-cpuid.patch Patch15: mozilla-libvpx-buildfix.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Requires: mozilla-js193 +Requires: mozilla-js193 = %{version} Requires(post): update-alternatives coreutils Requires(preun): update-alternatives coreutils ### build configuration ### @@ -92,7 +92,7 @@ ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} -%global provfind sh -c "grep -Ev 'mozsqlite3|dbusservice|unixprint|mozalloc' | %__find_provides" +%global provfind sh -c "grep -Ev 'mozsqlite3|dbusservice|unixprint' | %__find_provides" %global __find_provides %provfind %if %has_system_nspr BuildRequires: mozilla-nspr-devel @@ -124,7 +124,7 @@ %package devel License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Summary: XULRunner/Gecko SDK 1.9.3 +Summary: XULRunner/Gecko SDK 2.0 Group: Development/Libraries/Other %if %has_system_nspr Requires: mozilla-nspr-devel >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr-devel) @@ -141,7 +141,7 @@ %package translations-common License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Summary: Common translations for XULRunner 1.9.3 +Summary: Common translations for XULRunner 2.0 Group: System/Localization Requires: %{name} = %{version} 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) @@ -158,7 +158,7 @@ %package translations-other License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ -Summary: Extra translations for XULRunner 1.9.3 +Summary: Extra translations for XULRunner 2.0 Group: System/Localization Requires: %{name} = %{version} Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;ku;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi)