diff --git a/.firefox.metadata b/.firefox.metadata index 76333df..4beb894 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,6 +1,6 @@ 511960dd78451a06c9df76509635aeec05b2051a SOURCES/Python-2.7.8.tgz 467bdb846d67c01aed9e521fe0ef280065a50c3c SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -ff1af08655356a4d94915ddca61188c14a249a74 SOURCES/firefox-52.1.0esr.source.tar.xz -3670de55da29041f426c741c3a4baa6afa4b5cdb SOURCES/firefox-langpacks-52.1.0esr-20170419.tar.xz +894159e3100a3a90f893ac85a6b650c6b813c4c6 SOURCES/firefox-52.2.0esr.source.tar.xz +253c930cc2c81174c9e7304ebf8b0db3f2063dec SOURCES/firefox-langpacks-52.2.0esr-20170608.tar.xz e5ba84786af5d0e0e23b1a9112c76821ef23306c SOURCES/gcc48-4.8.2-16.el5.src.rpm 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.gitignore b/.gitignore index a2a9cce..5b01c20 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/Python-2.7.8.tgz SOURCES/devtoolset-2-binutils-2.23.52.0.1-10.el5.src.rpm -SOURCES/firefox-52.1.0esr.source.tar.xz -SOURCES/firefox-langpacks-52.1.0esr-20170419.tar.xz +SOURCES/firefox-52.2.0esr.source.tar.xz +SOURCES/firefox-langpacks-52.2.0esr-20170608.tar.xz SOURCES/gcc48-4.8.2-16.el5.src.rpm SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/SOURCES/build-nss-version.patch b/SOURCES/build-nss-version.patch index 36c2632..30b670b 100644 --- a/SOURCES/build-nss-version.patch +++ b/SOURCES/build-nss-version.patch @@ -5,8 +5,8 @@ diff -up firefox-52.0esr/old-configure.in.nss-ver firefox-52.0esr/old-configure. _USE_SYSTEM_NSS=1 ) if test -n "$_USE_SYSTEM_NSS"; then -- AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) -+ AM_PATH_NSS(3.28.1, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) +- AM_PATH_NSS(3.28.5, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) ++ AM_PATH_NSS(3.28.4, [MOZ_SYSTEM_NSS=1], [AC_MSG_ERROR([you don't have NSS installed or your version is too old])]) fi if test -n "$MOZ_SYSTEM_NSS"; then diff --git a/SOURCES/firefox-centos-default-prefs.js b/SOURCES/firefox-centos-default-prefs.js deleted file mode 100644 index fd3108f..0000000 --- a/SOURCES/firefox-centos-default-prefs.js +++ /dev/null @@ -1,27 +0,0 @@ -pref("app.update.auto", false); -pref("app.update.enabled", false); -pref("app.update.autoInstallEnabled", false); -pref("browser.backspace_action", 2); -pref("browser.display.use_system_colors", true); -pref("browser.download.folderList", 1); -pref("browser.link.open_external", 3); -pref("browser.shell.checkDefaultBrowser", false); -pref("general.smoothScroll", true); -pref("general.useragent.vendor", "CentOS"); -pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); -pref("intl.locale.matchOS", true); -pref("storage.nfs_filesystem", false); -pref("dom.ipc.plugins.enabled.nswrapper*", false); -pref("network.manage-offline-status", true); -pref("toolkit.networkmanager.disable", false); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); -pref("toolkit.storage.synchronous", 0); -pref("startup.homepage_override_url", "http://www.centos.org"); -pref("startup.homepage_welcome_url", "http://www.centos.org"); -pref("extensions.shownSelectionUI", true); -/* Workaround for rhbz#1110291 */ -pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); -/* Workaround for mozbz#1063315 */ -pref("security.use_mozillapkix_verification", false); -pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); -pref("browser.tabs.remote.autostart", false); diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js new file mode 100644 index 0000000..02113f4 --- /dev/null +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -0,0 +1,27 @@ +pref("app.update.auto", false); +pref("app.update.enabled", false); +pref("app.update.autoInstallEnabled", false); +pref("browser.backspace_action", 2); +pref("browser.display.use_system_colors", true); +pref("browser.download.folderList", 1); +pref("browser.link.open_external", 3); +pref("browser.shell.checkDefaultBrowser", false); +pref("general.smoothScroll", true); +pref("general.useragent.vendor", "Red Hat"); +pref("general.useragent.vendorSub", "FIREFOX_RPM_VR"); +pref("intl.locale.matchOS", true); +pref("storage.nfs_filesystem", false); +pref("dom.ipc.plugins.enabled.nswrapper*", false); +pref("network.manage-offline-status", true); +pref("toolkit.networkmanager.disable", false); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); +pref("toolkit.storage.synchronous", 0); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("extensions.shownSelectionUI", true); +/* Workaround for rhbz#1110291 */ +pref("network.negotiate-auth.allow-insecure-ntlm-v1", true); +/* Workaround for mozbz#1063315 */ +pref("security.use_mozillapkix_verification", false); +pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); +pref("browser.tabs.remote.autostart", false); diff --git a/SOURCES/rhbz-1451055.patch b/SOURCES/rhbz-1451055.patch new file mode 100644 index 0000000..b07036f --- /dev/null +++ b/SOURCES/rhbz-1451055.patch @@ -0,0 +1,12 @@ +diff -up firefox-52.1.1esr/layout/style/nsCSSPseudoElements.h.old firefox-52.1.1esr/layout/style/nsCSSPseudoElements.h +--- firefox-52.1.1esr/layout/style/nsCSSPseudoElements.h.old 2017-05-17 11:40:23.609432532 +0200 ++++ firefox-52.1.1esr/layout/style/nsCSSPseudoElements.h 2017-05-17 12:11:01.635624205 +0200 +@@ -109,7 +109,7 @@ private: + + // Work around https://gcc.gnu.org/bugzilla/show_bug.cgi?id=64037 , + // which is a general gcc bug that we seem to have hit only on Android/x86. +-#if defined(ANDROID) && defined(__i386__) && defined(__GNUC__) && \ ++#if defined(__i386__) && defined(__GNUC__) && \ + !defined(__clang__) + #if (MOZ_GCC_VERSION_AT_LEAST(4,8,0) && MOZ_GCC_VERSION_AT_MOST(4,8,4)) || \ + (MOZ_GCC_VERSION_AT_LEAST(4,9,0) && MOZ_GCC_VERSION_AT_MOST(4,9,2)) diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index eca9aaf..c1aa24b 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -1,6 +1,6 @@ %define system_nss 1 %global nspr_version 4.13.1 -%global nss_version 3.28.2 +%global nss_version 3.28.4 %define system_sqlite 0 %define sqlite_version 3.8.4.2 %define system_ffi 1 @@ -76,8 +76,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 52.1.0 -Release: 2%{?dist} +Version: 52.2.0 +Release: 1%{?dist} URL: http://www.mozilla.org/projects/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Group: Applications/Internet @@ -88,10 +88,10 @@ Group: Applications/Internet # From ftp://archive.mozilla.org/pub/firefox/releases/%{version}%{?ext_version}/source Source0: firefox-%{version}%{?ext_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?ext_version}-20170419.tar.xz +Source1: firefox-langpacks-%{version}%{?ext_version}-20170608.tar.xz %endif Source10: firefox-mozconfig -Source12: firefox-centos-default-prefs.js +Source12: firefox-redhat-default-prefs.js Source20: firefox.desktop Source600: firefox.sh.in.rhel6 Source700: firefox.sh.in.rhel7 @@ -134,6 +134,7 @@ Patch202: mozilla-1152515.patch # RHEL7 patches # RHEL6 patches +Patch300: rhbz-1451055.patch # --------------------------------------------------- BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) @@ -385,6 +386,7 @@ cd %{tarballdir} %endif %if %{?rhel} == 6 +%patch300 -p1 -b .rhbz-1451055 %endif # Patch for big endian platforms only @@ -875,8 +877,14 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog -* Thu Apr 20 2017 Johnny Hughes - 52.1.0-2 -- Manual Debranding after Auto Debranding failed. +* Thu Jun 8 2017 Jan Horak - 52.2.0-1 +- Update to 52.2.0 ESR + +* Wed May 17 2017 Martin Stransky - 52.1.1-2 +- Added fix for rhbz#1451055 + +* Fri May 5 2017 Jan Horak - 52.1.1-1 +- Update to 52.1.1 ESR * Wed Apr 19 2017 Martin Stransky - 52.1.0-2 - Update to 52.1.0 ESR (Build3)