From e27adcb086f56fe74cb4e1da08ab4ed126fe8cd54b3bcd8b3a8782c0f82b94e1 Mon Sep 17 00:00:00 2001
From: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Date: Thu, 26 May 2016 05:57:29 +0000
Subject: [PATCH] Accepting request 398058 from
 home:badshah400:branches:mozilla:Factory

Fix building for non-factory openSUSE. The patches have guards themselves wherever needed, we don't need to be paranoid about applying them unconditionally. Sorry for breaking the build earlier.

OBS-URL: https://build.opensuse.org/request/show/398058
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=516
---
 MozillaFirefox.changes | 6 ++++++
 MozillaFirefox.spec    | 5 -----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/MozillaFirefox.changes b/MozillaFirefox.changes
index ea8bc02b..f04d6e65 100644
--- a/MozillaFirefox.changes
+++ b/MozillaFirefox.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 25 16:36:23 UTC 2016 - badshah400@gmail.com
+
+- The conditional testing for gcc was failing for different
+  openSUSE versions, drop it and apply patches unconditionally.
+
 -------------------------------------------------------------------
 Mon May 23 15:30:27 UTC 2016 - badshah400@gmail.com
 
diff --git a/MozillaFirefox.spec b/MozillaFirefox.spec
index bd1b831e..377a1e49 100644
--- a/MozillaFirefox.spec
+++ b/MozillaFirefox.spec
@@ -66,9 +66,6 @@
 %define crashreporter 1
 %endif
 
-# DETERMINE GCC VERSION TO KNOW WHEN TO APPLY PATCH15 AND PATCH16
-%define gcc_ver %(rpm -q --whatprovides --qf '%%{version}' gcc)
-
 Name:           %{pkgname}
 BuildRequires:  Mesa-devel
 BuildRequires:  autoconf213
@@ -291,10 +288,8 @@ cd $RPM_BUILD_DIR/mozilla
 %patch13 -p1
 %endif
 %patch14 -p1
-%if %{gcc_ver} >= 6
 %patch15 -p1
 %patch16 -p1
-%endif
 # Firefox
 %patch101 -p1
 %patch102 -p1