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
This commit is contained in:
parent
cfd71a65e4
commit
e27adcb086
@ -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
|
Mon May 23 15:30:27 UTC 2016 - badshah400@gmail.com
|
||||||
|
|
||||||
|
@ -66,9 +66,6 @@
|
|||||||
%define crashreporter 1
|
%define crashreporter 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# DETERMINE GCC VERSION TO KNOW WHEN TO APPLY PATCH15 AND PATCH16
|
|
||||||
%define gcc_ver %(rpm -q --whatprovides --qf '%%{version}' gcc)
|
|
||||||
|
|
||||||
Name: %{pkgname}
|
Name: %{pkgname}
|
||||||
BuildRequires: Mesa-devel
|
BuildRequires: Mesa-devel
|
||||||
BuildRequires: autoconf213
|
BuildRequires: autoconf213
|
||||||
@ -291,10 +288,8 @@ cd $RPM_BUILD_DIR/mozilla
|
|||||||
%patch13 -p1
|
%patch13 -p1
|
||||||
%endif
|
%endif
|
||||||
%patch14 -p1
|
%patch14 -p1
|
||||||
%if %{gcc_ver} >= 6
|
|
||||||
%patch15 -p1
|
%patch15 -p1
|
||||||
%patch16 -p1
|
%patch16 -p1
|
||||||
%endif
|
|
||||||
# Firefox
|
# Firefox
|
||||||
%patch101 -p1
|
%patch101 -p1
|
||||||
%patch102 -p1
|
%patch102 -p1
|
||||||
|
Loading…
Reference in New Issue
Block a user