--- a/MozillaFirefox/create-tar.sh Mon Apr 16 23:11:43 2012 +0200
+++ b/MozillaFirefox/create-tar.sh Sat Apr 21 19:08:35 2012 +0200
@@ -2,8 +2,8 @@
CHANNEL="esr10"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_3esr_RELEASE"
-VERSION="10.0.3"
+RELEASE_TAG="FIREFOX_10_0_4esr_RELEASE"
+VERSION="10.0.4"
# mozilla
hg clone -r $RELEASE_TAG http://hg.mozilla.org/$BRANCH mozilla
--- a/MozillaFirefox/firefox-esr.changes Mon Apr 16 23:11:43 2012 +0200
+++ b/MozillaFirefox/firefox-esr.changes Sat Apr 21 19:08:35 2012 +0200
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Sat Apr 21 11:54:44 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 10.0.4esr (bnc#758408)
+- this package replaces MozillaFirefox for distributions older
+ than 11.3
+
-------------------------------------------------------------------
Sun Mar 4 15:42:27 UTC 2012 - wr@rosenauer.org
--- a/MozillaFirefox/firefox-esr.spec Mon Apr 16 23:11:43 2012 +0200
+++ b/MozillaFirefox/firefox-esr.spec Sat Apr 21 19:08:35 2012 +0200
@@ -18,7 +18,7 @@
%define major 10
-%define mainver %major.0.3
+%define mainver %major.0.4
Name: firefox-esr
BuildRequires: Mesa-devel
@@ -48,7 +48,7 @@
BuildRequires: nss-shared-helper-devel
Version: %{mainver}
Release: 0
-%define releasedate 2012030300
+%define releasedate 2012042100
Provides: web_browser
Provides: firefox-esr = %{mainver}
# this is needed to match this package with the kde4 helper package without the main package
@@ -59,7 +59,10 @@
Conflicts: MozillaFirefox
# replace older MozillaFirefox packages for dists up to 11.2
%if %suse_version < 1130
-Obsoletes: MozillaFirefox < %{version}
+Provides: MozillaFirefox = %{version}
+Obsoletes: MozillaFirefox <= %{version}
+%else
+Conflicts: MozillaFirefox
%endif
Summary: Mozilla Firefox Web Browser ESR
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
--- a/mozilla-pkgconfig.patch Mon Apr 16 23:11:43 2012 +0200
+++ b/mozilla-pkgconfig.patch Sat Apr 21 19:08:35 2012 +0200
@@ -4,11 +4,11 @@
diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in
--- a/xulrunner/installer/Makefile.in
+++ b/xulrunner/installer/Makefile.in
-@@ -66,16 +66,19 @@ include $(topsrcdir)/config/rules.mk
-
+@@ -67,16 +67,19 @@ include $(topsrcdir)/config/rules.mk
INSTALL_SDK = 1
GENERATE_CACHE = 1
+ include $(topsrcdir)/toolkit/mozapps/installer/signing.mk
include $(topsrcdir)/toolkit/mozapps/installer/packager.mk
# Add pkg-config files to the install:: target
@@ -24,7 +24,7 @@
$(NULL)
ifdef MOZ_NATIVE_NSPR
-@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc
+@@ -104,16 +107,17 @@ pkg_config_files += mozilla-nss.pc
endif
%.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS)
--- a/mozilla-repo.patch Mon Apr 16 23:11:43 2012 +0200
+++ b/mozilla-repo.patch Sat Apr 21 19:08:35 2012 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 07dc7ea11c92368cb7c137a403feaaa6861abb3c
+# Parent 200bf63c79a65f770fcb6148dbfba403d9c9ef2c
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in
@@ -48,7 +48,7 @@
diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk
--- a/toolkit/mozapps/installer/package-name.mk
+++ b/toolkit/mozapps/installer/package-name.mk
-@@ -154,20 +154,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
+@@ -162,20 +162,20 @@ SYMBOL_ARCHIVE_BASENAME = $(PKG_BASENAME
TEST_PACKAGE = $(PKG_BASENAME).tests.zip
ifneq (,$(wildcard $(DIST)/bin/application.ini))
@@ -67,14 +67,14 @@
-MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
+#MOZ_SOURCE_REPO = $(shell cd $(MOZILLA_DIR) && hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" -e "s/\/$(_dollar)//" )
- MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(PKG_BASENAME).txt
+ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_SOURCESTAMP_FILE_BASENAME).txt
# JavaScript Shell
PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in
-@@ -227,17 +227,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
+@@ -230,17 +230,17 @@ DEFINES += -DHAVE_USR_LIB64_DIR
endif
endif
--- a/xulrunner/create-tar.sh Mon Apr 16 23:11:43 2012 +0200
+++ b/xulrunner/create-tar.sh Sat Apr 21 19:08:35 2012 +0200
@@ -2,8 +2,8 @@
CHANNEL="esr10"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_10_0_3esr_RELEASE"
-VERSION="10.0.3"
+RELEASE_TAG="FIREFOX_10_0_4esr_RELEASE"
+VERSION="10.0.4"
# mozilla
hg clone -r $RELEASE_TAG http://hg.mozilla.org/$BRANCH mozilla
--- a/xulrunner/xulrunner-esr.changes Mon Apr 16 23:11:43 2012 +0200
+++ b/xulrunner/xulrunner-esr.changes Sat Apr 21 19:08:35 2012 +0200
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Apr 21 15:36:28 UTC 2012 - wr@rosenauer.org
+
+- update to 10.0.4esr (bnc#758408)
+
-------------------------------------------------------------------
Mon Mar 5 07:15:57 UTC 2012 - wr@rosenauer.org
--- a/xulrunner/xulrunner-esr.spec Mon Apr 16 23:11:43 2012 +0200
+++ b/xulrunner/xulrunner-esr.spec Sat Apr 21 19:08:35 2012 +0200
@@ -44,12 +44,12 @@
%endif
BuildRequires: mozilla-nspr-devel >= 4.9.0
BuildRequires: mozilla-nss-devel >= 3.13.3
-Version: 10.0.3
+Version: 10.0.4
Release: 0
-%define releasedate 2012030300
-%define version_internal 10.0.3
+%define releasedate 2012042100
+%define version_internal 10.0.4
%define apiversion 10
-%define uaweight 1000003
+%define uaweight 1000004
Summary: Mozilla Runtime Environment ESR
License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+
Group: Productivity/Other