diff --git a/.firefox.metadata b/.firefox.metadata
index abfd809..8f0e37e 100644
--- a/.firefox.metadata
+++ b/.firefox.metadata
@@ -1,2 +1,2 @@
-ed9b1f07b6fdcbea151cfe05c9a4483844d40957 SOURCES/firefox-langpacks-24.5.0esr-20140422.tar.bz2
-1b549d6dce80faec1c23f11b95122e607d2ed1bb SOURCES/firefox-24.5.0esr.source.tar.bz2
+061912d61e3ff2766b7fb1082d91af50d10b545a SOURCES/firefox-langpacks-24.6.0esr-20140604.tar.bz2
+9dfbf8c5cf749a142890011071bd5fbeab60d20d SOURCES/firefox-24.6.0esr.source.tar.bz2
diff --git a/.gitignore b/.gitignore
index 24ea8f3..5fd40f6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,2 @@
-SOURCES/firefox-langpacks-24.5.0esr-20140422.tar.bz2
-SOURCES/firefox-24.5.0esr.source.tar.bz2
+SOURCES/firefox-langpacks-24.6.0esr-20140604.tar.bz2
+SOURCES/firefox-24.6.0esr.source.tar.bz2
diff --git a/SOURCES/xulrunner-2.0-chromium-types.patch b/SOURCES/xulrunner-2.0-chromium-types.patch
deleted file mode 100644
index a350b41..0000000
--- a/SOURCES/xulrunner-2.0-chromium-types.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h
---- xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h.chromium-types 2011-06-15 23:57:26.000000000 +0200
-+++ xulrunner-5.0/mozilla-release/gfx/ycbcr/chromium_types.h 2011-06-29 08:23:46.807314175 +0200
-@@ -61,10 +61,14 @@ typedef PRInt16 int16;
- #define ARCH_CPU_ARM_FAMILY 1
- #define ARCH_CPU_ARMEL 1
- #define ARCH_CPU_32_BITS 1
--#elif defined(__ppc__) || defined(__powerpc) || defined(__PPC__)
-+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
- #define ARCH_CPU_PPC_FAMILY 1
- #define ARCH_CPU_PPC 1
- #define ARCH_CPU_32_BITS 1
-+#elif defined(__powerpc64__)
-+#define ARCH_CPU_PPC_FAMILY 1
-+#define ARCH_CPU_PPC 1
-+#define ARCH_CPU_64_BITS 1
- #elif defined(__sparc)
- #define ARCH_CPU_SPARC_FAMILY 1
- #define ARCH_CPU_SPARC 1
-@@ -73,6 +77,14 @@ typedef PRInt16 int16;
- #define ARCH_CPU_SPARC_FAMILY 1
- #define ARCH_CPU_SPARC 1
- #define ARCH_CPU_64_BITS 1
-+#elif defined(__s390__)
-+#define ARCH_CPU_S390_FAMILY 1
-+#define ARCH_CPU_S390 1
-+#define ARCH_CPU_32_BITS 1
-+#elif defined(__s390x__)
-+#define ARCH_CPU_S390_FAMILY 1
-+#define ARCH_CPU_S390 1
-+#define ARCH_CPU_64_BITS 1
- #else
- #warning Please add support for your architecture in chromium_types.h
- #endif
diff --git a/SOURCES/xulrunner-webrtc-secondarch.patch b/SOURCES/xulrunner-webrtc-secondarch.patch
deleted file mode 100644
index f0c4c37..0000000
--- a/SOURCES/xulrunner-webrtc-secondarch.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -up xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/src/typedefs.h.old xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/src/typedefs.h
---- xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/webrtc/typedefs.h.old 2012-11-16 20:47:22.000000000 +0100
-+++ xulrunner-17.0/mozilla-esr17/media/webrtc/trunk/webrtc/typedefs.h 2012-11-27 15:24:26.910592024 +0100
-@@ -37,6 +37,30 @@
- #define WEBRTC_ARCH_32_BITS
- #define WEBRTC_ARCH_LITTLE_ENDIAN
- #define WEBRTC_LITTLE_ENDIAN
-+#elif defined(__powerpc64__)
-+#define WEBRTC_ARCH_PPC_FAMILY
-+#define WEBRTC_ARCH_PPC
-+#define WEBRTC_ARCH_64_BITS
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#define WEBRTC_BIG_ENDIAN
-+#elif defined(__ppc__) || defined(__powerpc__) || defined(__PPC__)
-+#define WEBRTC_ARCH_PPC_FAMILY
-+#define WEBRTC_ARCH_PPC
-+#define WEBRTC_ARCH_32_BITS
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#define WEBRTC_BIG_ENDIAN
-+#elif defined(__s390x__)
-+#define WEBRTC_ARCH_S390_FAMILY
-+#define WEBRTC_ARCH_S390
-+#define WEBRTC_ARCH_64_BITS
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#define WEBRTC_BIG_ENDIAN
-+#elif defined(__s390__)
-+#define WEBRTC_ARCH_S390_FAMILY
-+#define WEBRTC_ARCH_S390
-+#define WEBRTC_ARCH_32_BITS
-+#define WEBRTC_ARCH_BIG_ENDIAN
-+#define WEBRTC_BIG_ENDIAN
- #elif defined(__ARMEL__)
- // TODO(andrew): We'd prefer to control platform defines here, but this is
- // currently provided by the Android makefiles. Commented to avoid duplicate
diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec
index 5206568..cbaab95 100644
--- a/SPECS/firefox.spec
+++ b/SPECS/firefox.spec
@@ -53,7 +53,7 @@
Summary: Mozilla Firefox Web browser
Name: firefox
-Version: 24.5.0
+Version: 24.6.0
Release: 1%{?prever}%{?dist}
URL: http://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+
@@ -61,7 +61,7 @@ Group: Applications/Internet
# From ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pretag}/source
Source0: firefox-%{version}%{?prever}%{?ext_version}.source.tar.bz2
%if %{build_langpacks}
-Source1: firefox-langpacks-%{version}%{?ext_version}-20140422.tar.bz2
+Source1: firefox-langpacks-%{version}%{?ext_version}-20140604.tar.bz2
%endif
Source10: firefox-mozconfig
Source11: firefox-mozconfig-branded
@@ -73,10 +73,8 @@ Source100: find-external-requires
# Build patches
Patch0: firefox-install-dir.patch
-Patch3: xulrunner-2.0-chromium-types.patch
Patch4: xulrunner-24.0-gcc47.patch
Patch5: xulrunner-24.0-jemalloc-ppc.patch
-Patch7: xulrunner-webrtc-secondarch.patch
# RPM specific patches
Patch11: firefox-24.0-default.patch
@@ -182,10 +180,8 @@ cd %{tarballdir}
# Build patches
# We have to keep original patch backup extension to go thru configure without problems with tests
%patch0 -p1 -b .orig
-%patch3 -p2 -b .chromium-types.patch
%patch4 -p2 -b .gcc47.patch
%patch5 -p2 -b .jemalloc-ppc.patch
-%patch7 -p2 -b .webrtc
# RPM specific patches
%patch11 -p2 -b .default
@@ -506,6 +502,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#---------------------------------------------------------------------
%changelog
+* Wed Jun 4 2014 Jan Horak <jhorak@redhat.com> - 24.6.0-1
+- Update to 24.6.0 ESR
+
+* Wed Apr 23 2014 Martin Stransky <stransky@redhat.com> - 24.5.0-2
+- Removed unused patches
+
* Tue Apr 22 2014 Martin Stransky <stransky@redhat.com> - 24.5.0-1
- Update to 24.5.0 ESR