forked from pool/MozillaThunderbird
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
This commit is contained in:
parent
825fd5282e
commit
e2e9d6aec1
@ -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
|
Tue May 24 18:28:31 UTC 2016 - badshah400@gmail.com
|
||||||
|
|
||||||
|
@ -21,8 +21,6 @@
|
|||||||
%define update_channel release
|
%define update_channel release
|
||||||
%define releasedate 2016050700
|
%define releasedate 2016050700
|
||||||
|
|
||||||
%define gcc_ver %(rpm -q --whatprovides --qf '%%{version}' gcc)
|
|
||||||
|
|
||||||
%if %suse_version > 1310
|
%if %suse_version > 1310
|
||||||
%define gstreamer_ver 1.0
|
%define gstreamer_ver 1.0
|
||||||
%define gstreamer 1
|
%define gstreamer 1
|
||||||
@ -202,11 +200,8 @@ pushd mozilla
|
|||||||
%endif
|
%endif
|
||||||
%patch4 -p1
|
%patch4 -p1
|
||||||
%patch5 -p1
|
%patch5 -p1
|
||||||
# APPLY Patch6 and Patch7 ONLY IF GCC >= 6 IS USED FOR COMPILATION
|
|
||||||
%if %{gcc_ver} >= 6
|
|
||||||
%patch6 -p1
|
%patch6 -p1
|
||||||
%patch7 -p1
|
%patch7 -p1
|
||||||
%endif
|
|
||||||
popd
|
popd
|
||||||
# comm-central patches
|
# comm-central patches
|
||||||
%patch20 -p1
|
%patch20 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user