From 5bb5b05469ecf06055a9d8ba75754057c7e55950 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky@anakreon.cz>
Date: Mon, 1 Dec 2014 10:18:56 +0100
Subject: Update to 34.0 build 2

---
 .gitignore                  |  2 ++
 firefox-mozstub-build.patch | 12 ------------
 firefox.spec                | 11 ++++++-----
 sources                     |  4 ++--
 4 files changed, 10 insertions(+), 19 deletions(-)
 delete mode 100644 firefox-mozstub-build.patch

diff --git a/.gitignore b/.gitignore
index 32d5107..4e6c24f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -114,3 +114,5 @@ firefox-3.6.4.source.tar.bz2
 /firefox-33.0.source.tar.bz2
 /firefox-33.1.source.tar.bz2
 /firefox-langpacks-33.1-20141111.tar.xz
+/firefox-34.0.source.tar.bz2
+/firefox-langpacks-34.0-20141201.tar.xz
diff --git a/firefox-mozstub-build.patch b/firefox-mozstub-build.patch
deleted file mode 100644
index 3fe9310..0000000
--- a/firefox-mozstub-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up firefox-33.0/mozilla-release/toolkit/library/libxul.mk.old firefox-33.0/mozilla-release/toolkit/library/libxul.mk
---- firefox-33.0/mozilla-release/toolkit/library/libxul.mk.old	2014-11-03 13:37:20.206772190 +0100
-+++ firefox-33.0/mozilla-release/toolkit/library/libxul.mk	2014-11-03 13:36:56.966691951 +0100
-@@ -168,7 +168,7 @@ endif
- 
- ifdef MOZ_WIDGET_GTK
- ifdef MOZ_ENABLE_GTK3
--EXTRA_DSO_LDOPTS += $(filter-out -lgtk-3 -lgdk-3,$(TK_LIBS)) -lmozgtk_stub
-+EXTRA_DSO_LDOPTS += $(filter-out -lgtk-3 -lgdk-3,$(TK_LIBS)) -L$(LIBXUL_DIST)/lib -lmozgtk_stub
- else
- EXTRA_DSO_LDOPTS += $(TK_LIBS)
- endif
diff --git a/firefox.spec b/firefox.spec
index e8147c2..e7bf872 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -112,14 +112,14 @@
 
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
-Version:        33.1
-Release:        2%{?pre_tag}%{?dist}
+Version:        34.0
+Release:        1%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
 Source0:        ftp://ftp.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.bz2
 %if %{build_langpacks}
-Source1:        firefox-langpacks-%{version}%{?pre_version}-20141111.tar.xz
+Source1:        firefox-langpacks-%{version}%{?pre_version}-20141201.tar.xz
 %endif
 Source10:       firefox-mozconfig
 Source11:       firefox-mozconfig-branded
@@ -139,7 +139,6 @@ Patch18:        xulrunner-24.0-jemalloc-ppc.patch
 # workaround linking issue on s390 (JSContext::updateMallocCounter(size_t) not found)
 Patch19:        xulrunner-24.0-s390-inlines.patch
 Patch20:        firefox-build-prbool.patch
-Patch21:        firefox-mozstub-build.patch
 
 # Fedora specific patches
 # Unable to install addons from https pages
@@ -285,7 +284,6 @@ cd %{tarballdir}
 %patch18 -p2 -b .jemalloc-ppc
 %patch19 -p2 -b .s390-inlines
 %patch20 -p1 -b .prbool
-%patch21 -p2 -b .mozstub
 
 # For branding specific patches.
 
@@ -767,6 +765,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Mon Dec 1 2014 Martin Stransky <stransky@redhat.com> - 34.0-1
+- Update to 34.0 build 2
+
 * Thu Nov 13 2014 Martin Stransky <stransky@redhat.com> - 33.1-2
 - Disabled downloads non-free OpenH264 blob on first start
   (rhbz#1155499)
diff --git a/sources b/sources
index b2a38f7..820b43a 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-bd94c6465c53bf315b470259f1b1c896  firefox-33.1.source.tar.bz2
-b0baf9d436259a6f77b15015e993907f  firefox-langpacks-33.1-20141111.tar.xz
+8ce294a40ecaaf8a1ae6a6c6a6e2c3c9  firefox-34.0.source.tar.bz2
+988cd25476b027f1188271940800cc22  firefox-langpacks-34.0-20141201.tar.xz
-- 
cgit