From 92551052f62af4fa782b170d265e13aafabd58b8 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 6 Oct 2017 12:40:42 +0200 Subject: Updated to 57.0 Beta 5 --- firefox.spec | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index 1c7028f..5d86c4b 100644 --- a/firefox.spec +++ b/firefox.spec @@ -1,6 +1,3 @@ -# Use ALSA backend? -%define alsa_backend 0 - # Use system nspr/nss? %define system_nss 1 @@ -64,12 +61,12 @@ %endif %if %{?system_nss} -%global nspr_version 4.10.10 +%global nspr_version 4.17.0 # NSS/NSPR quite often ends in build override, so as requirement the version # we're building against could bring us some broken dependencies from time to time. #%global nspr_build_version %(pkg-config --silence-errors --modversion nspr 2>/dev/null || echo 65536) %global nspr_build_version %{nspr_version} -%global nss_version 3.32.1 +%global nss_version 3.33 #%global nss_build_version %(pkg-config --silence-errors --modversion nss 2>/dev/null || echo 65536) %global nss_build_version %{nss_version} %endif @@ -80,9 +77,12 @@ %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif +%define pre_version b5 + %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} %global langpackdir %{mozappdir}/langpacks +%global tarballdir %{name}-%{version}%{?pre_version} %define official_branding 1 %define build_langpacks 1 @@ -98,14 +98,14 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 56.0 -Release: 4%{?pre_tag}%{?dist} +Version: 57.0 +Release: 0.1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20170927.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20171005.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -122,16 +122,13 @@ Patch0: firefox-install-dir.patch Patch3: mozilla-build-arm.patch # https://bugzilla.redhat.com/show_bug.cgi?id=814879#c3 Patch18: xulrunner-24.0-jemalloc-ppc.patch -Patch20: firefox-build-prbool.patch Patch25: rhbz-1219542-s390-build.patch Patch26: build-icu-big-endian.patch Patch27: mozilla-1335250.patch # Also fixes s390x: https://bugzilla.mozilla.org/show_bug.cgi?id=1376268 Patch29: build-big-endian.patch -Patch30: fedora-build.patch Patch31: build-ppc64-s390x-curl.patch Patch32: build-rust-ppc64le.patch -Patch34: build-cubeb-pulse-arm.patch Patch35: build-ppc-jit.patch Patch36: build-missing-xlocale-h.patch # Always feel lucky for unsupported platforms: @@ -149,7 +146,6 @@ Patch225: mozilla-1005640-accept-lang.patch #ARM run-time patch Patch226: rhbz-1354671.patch Patch229: firefox-nss-version.patch -Patch230: rhbz-1497932.patch # Upstream patches Patch402: mozilla-1196777.patch @@ -159,7 +155,6 @@ Patch410: mozilla-1321521.patch Patch411: mozilla-1321521-2.patch Patch412: mozilla-1337988.patch Patch413: mozilla-1353817.patch -Patch414: mozilla-1341234.patch Patch415: mozilla-1405267.patch # Debian patches @@ -192,9 +187,6 @@ BuildRequires: pkgconfig(xrender) BuildRequires: pkgconfig(hunspell) %endif BuildRequires: pkgconfig(libstartup-notification-1.0) -%if %{?alsa_backend} -BuildRequires: pkgconfig(alsa) -%endif BuildRequires: pkgconfig(libnotify) >= %{libnotify_version} BuildRequires: pkgconfig(dri) BuildRequires: pkgconfig(libcurl) @@ -299,7 +291,7 @@ This package contains results of tests executed during build. #--------------------------------------------------------------------- %prep -%setup -q +%setup -q -n %{tarballdir} # Build patches, can't change backup suffix from default because during build # there is a compare of config and js/config directories and .orig suffix is @@ -308,15 +300,12 @@ This package contains results of tests executed during build. %patch18 -p1 -b .jemalloc-ppc -%patch20 -p1 -b .prbool %ifarch s390 %patch25 -p1 -b .rhbz-1219542-s390 %endif %patch29 -p1 -b .big-endian -%patch30 -p1 -b .fedora-build %patch31 -p1 -b .ppc64-s390x-curl %patch32 -p1 -b .rust-ppc64le -# don't need that %patch34 -p1 -b .cubeb-pulse-arm %ifarch ppc ppc64 ppc64le %patch35 -p1 -b .ppc-jit %endif @@ -336,7 +325,6 @@ This package contains results of tests executed during build. %ifarch aarch64 %patch226 -p1 -b .1354671 %endif -%patch230 -p1 -b .1497932 %patch402 -p1 -b .1196777 %patch406 -p1 -b .256180 @@ -346,8 +334,8 @@ This package contains results of tests executed during build. %patch412 -p1 -b .1337988 %endif %endif + %patch413 -p1 -b .1353817 -%patch414 -p1 -b .1341234 %patch415 -p1 -b .1405267 # Debian extension patch @@ -395,10 +383,6 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig echo "ac_add_options --disable-elf-hack" >> .mozconfig %endif -%if %{?alsa_backend} -echo "ac_add_options --enable-alsa" >> .mozconfig -%endif - %if %{?system_hunspell} echo "ac_add_options --enable-system-hunspell" >> .mozconfig %else @@ -871,6 +855,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Oct 5 2017 Martin Stransky - 57.0-0.1 +- Updated to 57.0 Beta 5 + * Wed Oct 4 2017 Martin Stransky - 56.0-4 - Fixed rhbz#1497932 - Plug-Ins for example flash fails because of unresolved symbols -- cgit From 1ae49b3a70a6a75888417b1d9a7a4699efeb5a98 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Fri, 6 Oct 2017 21:00:47 +0200 Subject: Added patch for mozbz#1399611 - CSD emulation --- firefox.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index 5d86c4b..ecd2015 100644 --- a/firefox.spec +++ b/firefox.spec @@ -156,6 +156,7 @@ Patch411: mozilla-1321521-2.patch Patch412: mozilla-1337988.patch Patch413: mozilla-1353817.patch Patch415: mozilla-1405267.patch +Patch416: mozilla-1399611.patch # Debian patches Patch500: mozilla-440908.patch @@ -313,8 +314,6 @@ This package contains results of tests executed during build. %patch3 -p1 -b .arm -# For branding specific patches. - # Fedora patches %patch215 -p1 -b .addons %patch219 -p2 -b .rhbz-1173156 @@ -337,6 +336,7 @@ This package contains results of tests executed during build. %patch413 -p1 -b .1353817 %patch415 -p1 -b .1405267 +%patch416 -p1 -b .1399611 # Debian extension patch %patch500 -p1 -b .440908 @@ -857,6 +857,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %changelog * Thu Oct 5 2017 Martin Stransky - 57.0-0.1 - Updated to 57.0 Beta 5 +- Added patch for mozbz#1399611 - CSD emulation * Wed Oct 4 2017 Martin Stransky - 56.0-4 - Fixed rhbz#1497932 - Plug-Ins for example flash fails -- cgit From cd2371798ab1703676aec1a74a41ca64335af050 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 9 Oct 2017 10:42:56 +0200 Subject: Updated to 57.0 Beta 6 --- firefox.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index ecd2015..c103013 100644 --- a/firefox.spec +++ b/firefox.spec @@ -77,7 +77,7 @@ %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif -%define pre_version b5 +%define pre_version b6 %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} @@ -99,13 +99,13 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 57.0 -Release: 0.1%{?pre_tag}%{?dist} +Release: 0.2%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20171005.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20171009.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -855,6 +855,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Oct 9 2017 Martin Stransky - 57.0-0.2 +- Updated to 57.0 Beta 6 + * Thu Oct 5 2017 Martin Stransky - 57.0-0.1 - Updated to 57.0 Beta 5 - Added patch for mozbz#1399611 - CSD emulation -- cgit From fd700ad0ae450c4705017e05db7af709f7ea90f0 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 9 Oct 2017 14:49:41 +0200 Subject: Disabled stylo on i686 --- firefox.spec | 3 +++ 1 file changed, 3 insertions(+) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index c103013..f839e2e 100644 --- a/firefox.spec +++ b/firefox.spec @@ -453,6 +453,9 @@ echo "ac_add_options --without-system-icu" >> .mozconfig echo "ac_add_options --disable-ion" >> .mozconfig %endif +%ifarch %{ix86} +echo "ac_add_options --disable-stylo" >> .mozconfig +%endif #--------------------------------------------------------------------- -- cgit From 4f71e4765388439a6c2af118be25b5429c3f0c3e Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Wed, 11 Oct 2017 14:23:39 +0200 Subject: Updated to 57.0 Beta 7 --- firefox.spec | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index f839e2e..e619503 100644 --- a/firefox.spec +++ b/firefox.spec @@ -77,7 +77,7 @@ %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif -%define pre_version b6 +%define pre_version b7 %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} @@ -99,13 +99,13 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 57.0 -Release: 0.2%{?pre_tag}%{?dist} +Release: 0.3%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20171009.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20171011.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -155,7 +155,6 @@ Patch410: mozilla-1321521.patch Patch411: mozilla-1321521-2.patch Patch412: mozilla-1337988.patch Patch413: mozilla-1353817.patch -Patch415: mozilla-1405267.patch Patch416: mozilla-1399611.patch # Debian patches @@ -335,7 +334,6 @@ This package contains results of tests executed during build. %endif %patch413 -p1 -b .1353817 -%patch415 -p1 -b .1405267 %patch416 -p1 -b .1399611 # Debian extension patch @@ -858,6 +856,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Wed Oct 11 2017 Martin Stransky - 57.0-0.3 +- Updated to 57.0 Beta 7 + * Mon Oct 9 2017 Martin Stransky - 57.0-0.2 - Updated to 57.0 Beta 6 -- cgit From 29052e77800f8522112525c0b2a2725ef28299a3 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Mon, 16 Oct 2017 11:48:47 +0200 Subject: Updated to 57.0 Beta 8 --- firefox.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index e619503..14f9672 100644 --- a/firefox.spec +++ b/firefox.spec @@ -77,7 +77,7 @@ %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif -%define pre_version b7 +%define pre_version b8 %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} @@ -99,13 +99,13 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 57.0 -Release: 0.3%{?pre_tag}%{?dist} +Release: 0.4%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20171011.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20171016.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -856,6 +856,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Mon Oct 16 2017 Martin Stransky - 57.0-0.4 +- Updated to 57.0 Beta 8 + * Wed Oct 11 2017 Martin Stransky - 57.0-0.3 - Updated to 57.0 Beta 7 -- cgit From b1a757cbd45f3653b0d54b87a2f7f93145ebfbd0 Mon Sep 17 00:00:00 2001 From: Martin Stransky Date: Thu, 19 Oct 2017 12:21:55 +0200 Subject: Updated to 57.0 Beta 9 --- firefox.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'firefox.spec') diff --git a/firefox.spec b/firefox.spec index 14f9672..86fb77f 100644 --- a/firefox.spec +++ b/firefox.spec @@ -77,7 +77,7 @@ %global sqlite_build_version %(pkg-config --silence-errors --modversion sqlite3 2>/dev/null || echo 65536) %endif -%define pre_version b8 +%define pre_version b9 %global mozappdir %{_libdir}/%{name} %global mozappdirdev %{_libdir}/%{name}-devel-%{version} @@ -99,13 +99,13 @@ Summary: Mozilla Firefox Web browser Name: firefox Version: 57.0 -Release: 0.4%{?pre_tag}%{?dist} +Release: 0.5%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20171016.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20171019.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -856,6 +856,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Thu Oct 19 2017 Martin Stransky - 57.0-0.5 +- Updated to 57.0 Beta 9 + * Mon Oct 16 2017 Martin Stransky - 57.0-0.4 - Updated to 57.0 Beta 8 -- cgit