From e2e9d6aec11390452153abdc7fd40908d0b2f2811364f071acee70c6e6f591ce Mon Sep 17 00:00:00 2001 From: Wolfgang Rosenauer Date: Thu, 26 May 2016 05:55:57 +0000 Subject: [PATCH] Accepting request 398081 from home:badshah400:branches:mozilla:Factory Fixed builds for TB the same way, applying the patches unconditionally. Again, sorry for breaking stuff earlier. OBS-URL: https://build.opensuse.org/request/show/398081 OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaThunderbird?expand=0&rev=319 --- MozillaThunderbird.changes | 6 ++++++ MozillaThunderbird.spec | 5 ----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/MozillaThunderbird.changes b/MozillaThunderbird.changes index 529b306..f68bdfd 100644 --- a/MozillaThunderbird.changes +++ b/MozillaThunderbird.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 25 18:20:24 UTC 2016 - badshah400@gmail.com + +- The conditional testing for gcc was failing for different + openSUSE versions, drop it and apply patches unconditionally. + ------------------------------------------------------------------- Tue May 24 18:28:31 UTC 2016 - badshah400@gmail.com diff --git a/MozillaThunderbird.spec b/MozillaThunderbird.spec index 444c43b..2008096 100644 --- a/MozillaThunderbird.spec +++ b/MozillaThunderbird.spec @@ -21,8 +21,6 @@ %define update_channel release %define releasedate 2016050700 -%define gcc_ver %(rpm -q --whatprovides --qf '%%{version}' gcc) - %if %suse_version > 1310 %define gstreamer_ver 1.0 %define gstreamer 1 @@ -202,11 +200,8 @@ pushd mozilla %endif %patch4 -p1 %patch5 -p1 -# APPLY Patch6 and Patch7 ONLY IF GCC >= 6 IS USED FOR COMPILATION -%if %{gcc_ver} >= 6 %patch6 -p1 %patch7 -p1 -%endif popd # comm-central patches %patch20 -p1