equal
deleted
inserted
replaced
20 # changed with every update |
20 # changed with every update |
21 %define major 59 |
21 %define major 59 |
22 %define mainver %major.99 |
22 %define mainver %major.99 |
23 %define update_channel beta |
23 %define update_channel beta |
24 %define branding 1 |
24 %define branding 1 |
25 %define releasedate 20180323154952 |
25 %define releasedate 20180426170554 |
26 |
26 |
27 # PIE, full relro (x86_64 for now) |
27 # PIE, full relro (x86_64 for now) |
28 %define build_hardened 1 |
28 %define build_hardened 1 |
29 |
29 |
30 # Firefox only supports i686 |
30 # Firefox only supports i686 |
56 BuildRequires: alsa-devel |
56 BuildRequires: alsa-devel |
57 BuildRequires: autoconf213 |
57 BuildRequires: autoconf213 |
58 BuildRequires: dbus-1-glib-devel |
58 BuildRequires: dbus-1-glib-devel |
59 BuildRequires: fdupes |
59 BuildRequires: fdupes |
60 %if 0%{?suse_version} <= 1320 |
60 %if 0%{?suse_version} <= 1320 |
61 BuildRequires: gcc5-c++ |
61 BuildRequires: gcc7-c++ |
62 %else |
62 %else |
63 BuildRequires: gcc-c++ |
63 BuildRequires: gcc-c++ |
64 %endif |
64 %endif |
65 BuildRequires: cargo |
65 BuildRequires: cargo |
66 BuildRequires: libXcomposite-devel |
66 BuildRequires: libXcomposite-devel |
69 BuildRequires: libiw-devel |
69 BuildRequires: libiw-devel |
70 BuildRequires: libnotify-devel |
70 BuildRequires: libnotify-devel |
71 BuildRequires: libproxy-devel |
71 BuildRequires: libproxy-devel |
72 BuildRequires: makeinfo |
72 BuildRequires: makeinfo |
73 BuildRequires: mozilla-nspr-devel >= 4.19 |
73 BuildRequires: mozilla-nspr-devel >= 4.19 |
74 BuildRequires: mozilla-nss-devel >= 3.36 |
74 BuildRequires: mozilla-nss-devel >= 3.36.1 |
75 BuildRequires: python-devel |
75 BuildRequires: python-devel |
76 BuildRequires: python2-xml |
76 BuildRequires: python2-xml |
77 BuildRequires: rust >= 1.24 |
77 BuildRequires: rust >= 1.24 |
78 BuildRequires: rust-std |
78 BuildRequires: rust-std |
79 BuildRequires: startup-notification-devel |
79 BuildRequires: startup-notification-devel |
148 Patch4: mozilla-openaes-decl.patch |
148 Patch4: mozilla-openaes-decl.patch |
149 Patch5: mozilla-no-stdcxx-check.patch |
149 Patch5: mozilla-no-stdcxx-check.patch |
150 Patch6: mozilla-reduce-files-per-UnifiedBindings.patch |
150 Patch6: mozilla-reduce-files-per-UnifiedBindings.patch |
151 Patch7: mozilla-aarch64-startup-crash.patch |
151 Patch7: mozilla-aarch64-startup-crash.patch |
152 Patch8: mozilla-bmo256180.patch |
152 Patch8: mozilla-bmo256180.patch |
153 Patch9: mozilla-i586-DecoderDoctorLogger.patch |
153 Patch9: mozilla-i586-DecoderDoctorLogger.patch |
154 Patch10: mozilla-i586-domPrefs.patch |
154 Patch10: mozilla-i586-domPrefs.patch |
|
155 Patch11: mozilla-enable-csd.patch |
155 # Firefox/browser |
156 # Firefox/browser |
156 Patch101: firefox-kde.patch |
157 Patch101: firefox-kde.patch |
157 Patch102: firefox-branded-icons.patch |
158 Patch102: firefox-branded-icons.patch |
158 |
159 |
159 BuildRoot: %{_tmppath}/%{name}-%{version}-build |
160 BuildRoot: %{_tmppath}/%{name}-%{version}-build |
264 %patch8 -p1 |
265 %patch8 -p1 |
265 %ifarch %ix86 |
266 %ifarch %ix86 |
266 %patch9 -p1 |
267 %patch9 -p1 |
267 %patch10 -p1 |
268 %patch10 -p1 |
268 %endif |
269 %endif |
|
270 %patch11 -p1 |
269 # Firefox |
271 # Firefox |
270 %patch101 -p1 |
272 %patch101 -p1 |
271 %patch102 -p1 |
273 %patch102 -p1 |
272 |
274 |
273 %build |
275 %build |
290 export MOZ_BUILD_DATE=%{releasedate} |
292 export MOZ_BUILD_DATE=%{releasedate} |
291 export MOZILLA_OFFICIAL=1 |
293 export MOZILLA_OFFICIAL=1 |
292 export BUILD_OFFICIAL=1 |
294 export BUILD_OFFICIAL=1 |
293 export MOZ_TELEMETRY_REPORTING=1 |
295 export MOZ_TELEMETRY_REPORTING=1 |
294 %if 0%{?suse_version} <= 1320 |
296 %if 0%{?suse_version} <= 1320 |
295 export CC=gcc-5 |
297 export CC=gcc-7 |
296 %endif |
298 %endif |
297 export CFLAGS="%{optflags} -fno-strict-aliasing" |
299 export CFLAGS="%{optflags} -fno-strict-aliasing" |
298 # boo#986541: add -fno-delete-null-pointer-checks for gcc6 |
300 # boo#986541: add -fno-delete-null-pointer-checks for gcc6 |
299 %if 0%{?suse_version} > 1320 |
301 %if 0%{?suse_version} > 1320 |
300 export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" |
302 export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" |
581 %{progdir}/firefox |
583 %{progdir}/firefox |
582 %{progdir}/firefox-bin |
584 %{progdir}/firefox-bin |
583 %{progdir}/application.ini |
585 %{progdir}/application.ini |
584 %{progdir}/chrome.manifest |
586 %{progdir}/chrome.manifest |
585 %{progdir}/dependentlibs.list |
587 %{progdir}/dependentlibs.list |
586 %{progdir}/icudt*.dat |
588 #%{progdir}/icudt*.dat |
587 %{progdir}/*.so |
589 %{progdir}/*.so |
588 %{progdir}/omni.ja |
590 %{progdir}/omni.ja |
589 %{progdir}/fonts/ |
591 %{progdir}/fonts/ |
590 %{progdir}/pingsender |
592 %{progdir}/pingsender |
591 %{progdir}/platform.ini |
593 %{progdir}/platform.ini |