stransky pushed to firefox (f21). "Merge branch 'master' into f21"

[notifications at fedoraproject.org]

>From a7c8bd825f63bb0f86bcbf2cbed28d528a015261 Mon Sep 17 00:00:00 2001
From: Martin Stransky <stransky at anakreon.cz>
Date: Tue, 7 Apr 2015 13:36:59 +0200
Subject: Fixed debug builds


diff --git a/firefox-debug.patch b/firefox-debug.patch
new file mode 100644
index 0000000..b719d26
--- /dev/null
+++ b/firefox-debug.patch
@@ -0,0 +1,12 @@
+diff -up mozilla-release/browser/installer/package-manifest.in.old mozilla-release/browser/installer/package-manifest.in
+--- mozilla-release/browser/installer/package-manifest.in.old	2015-04-03 04:30:05.000000000 +0200
++++ mozilla-release/browser/installer/package-manifest.in	2015-04-07 13:17:44.180343700 +0200
+@@ -608,7 +608,7 @@
+ @RESPATH@/components/MozKeyboard.js
+ @RESPATH@/components/InputMethod.manifest
+ 
+-#ifdef MOZ_DEBUG
++#ifdef ENABLE_TESTS
+ @RESPATH@/components/TestInterfaceJS.js
+ @RESPATH@/components/TestInterfaceJS.manifest
+ #endif
diff --git a/firefox.spec b/firefox.spec
index 4bd9edb..0adfb38 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -107,7 +107,7 @@
 Summary:        Mozilla Firefox Web browser
 Name:           firefox
 Version:        37.0.1
-Release:        1%{?pre_tag}%{?dist}
+Release:        2%{?pre_tag}%{?dist}
 URL:            http://www.mozilla.org/projects/firefox/
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Applications/Internet
@@ -134,6 +134,7 @@ Patch19:        xulrunner-24.0-s390-inlines.patch
 Patch20:        firefox-build-prbool.patch
 Patch21:        firefox-ppc64le.patch
 Patch23:        mozilla-1005535.patch
+Patch24:        firefox-debug.patch
 
 # Fedora specific patches
 # Unable to install addons from https pages
@@ -284,6 +285,7 @@ cd %{tarballdir}
 %patch20 -p1 -b .prbool
 %patch21 -p2 -b .ppc64le
 %patch23 -p1 -b .1005535
+%patch24 -p1 -b .debug
 
 %patch3  -p2 -b .arm
 
@@ -803,6 +805,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 #---------------------------------------------------------------------
 
 %changelog
+* Tue Apr 7 2015 Martin Stransky <stransky at redhat.com> - 37.0.1-2
+- Fixed debug builds
+
 * Tue Apr 7 2015 Martin Stransky <stransky at redhat.com> - 37.0.1-1
 - Update to 37.0.1
 
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/firefox.git/commit/?h=f21&id=02d7492731907f9d6f20d5fa587f24383f77bf14