diff --git a/.firefox.metadata b/.firefox.metadata index 3129be2..769164f 100644 --- a/.firefox.metadata +++ b/.firefox.metadata @@ -1,7 +1,7 @@ 18a8f30a0356c751b8d0ea6f76e764cab13ee046 SOURCES/Python-2.7.13.tar.xz -e7b9c954fdba527404b9b371f25890ec03d6a0ad SOURCES/firefox-60.1.0esr.source.tar.xz -188ce061988d69a7ffd629a19a3780eb62b6a40a SOURCES/firefox-langpacks-60.1.0esr-20180622.tar.xz +ace3cfe04d1a44677850c388f7dbb17ec19cae24 SOURCES/firefox-60.2.0esr.source.tar.xz +cec872816b104c904a81415b25bec7ed1dc70fde SOURCES/firefox-langpacks-60.2.0esr-20180831.tar.xz 6724218efbb1f3fa14541cb2f255970b98446a45 SOURCES/firefox-symbolic.svg -a7a6297b01578ad0f45c966816c46ce3f97e286b SOURCES/gtk3-private-3.22.26-1.el6.src.rpm +0de63f863b158454b9429234b52ed28a397ec45c SOURCES/gtk3-private-3.22.26-1.el6.src.rpm e188ab1a444697bc649e223c28389d82ca94c472 SOURCES/libffi-3.0.13-18.el7_3.src.rpm 77fd30f7ebc12a629a31c1e252cec06af55a71fe SOURCES/yasm-1.2.0-3.el5.src.rpm diff --git a/.gitignore b/.gitignore index 1122ae7..ba0d10e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ SOURCES/Python-2.7.13.tar.xz -SOURCES/firefox-60.1.0esr.source.tar.xz -SOURCES/firefox-langpacks-60.1.0esr-20180622.tar.xz +SOURCES/firefox-60.2.0esr.source.tar.xz +SOURCES/firefox-langpacks-60.2.0esr-20180831.tar.xz SOURCES/firefox-symbolic.svg SOURCES/gtk3-private-3.22.26-1.el6.src.rpm SOURCES/libffi-3.0.13-18.el7_3.src.rpm diff --git a/README.debrand b/README.debrand deleted file mode 100644 index 01c46d2..0000000 --- a/README.debrand +++ /dev/null @@ -1,2 +0,0 @@ -Warning: This package was configured for automatic debranding, but the changes -failed to apply. diff --git a/SOURCES/firefox-fedora-ua.patch b/SOURCES/firefox-fedora-ua.patch deleted file mode 100644 index a5b7866..0000000 --- a/SOURCES/firefox-fedora-ua.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up firefox-35.0.1/mozilla-release/media/webrtc/trunk/Makefile.old firefox-35.0.1/mozilla-release/media/webrtc/trunk/Makefile -diff -up firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp.old firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp ---- firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp.old 2015-01-23 07:00:06.000000000 +0100 -+++ firefox-35.0.1/mozilla-release/netwerk/protocol/http/nsHttpHandler.cpp 2015-02-09 16:40:42.983220596 +0100 -@@ -607,7 +607,7 @@ nsHttpHandler::BuildUserAgent() - mUserAgent.SetCapacity(mLegacyAppName.Length() + - mLegacyAppVersion.Length() + - #ifndef UA_SPARE_PLATFORM -- mPlatform.Length() + -+ mPlatform.Length() + 8 + - #endif - mOscpu.Length() + - mMisc.Length() + -@@ -631,6 +631,7 @@ nsHttpHandler::BuildUserAgent() - if (!mPlatform.IsEmpty()) { - mUserAgent += mPlatform; - mUserAgent.AppendLiteral("; "); -+ mUserAgent.AppendLiteral("Fedora; "); - } - #endif - if (!mCompatDevice.IsEmpty()) { diff --git a/SOURCES/firefox-redhat-default-prefs.js b/SOURCES/firefox-redhat-default-prefs.js index d902ab3..71d6506 100644 --- a/SOURCES/firefox-redhat-default-prefs.js +++ b/SOURCES/firefox-redhat-default-prefs.js @@ -14,9 +14,9 @@ pref("browser.shell.checkDefaultBrowser", false); pref("network.manage-offline-status", true); pref("extensions.shownSelectionUI", true); pref("ui.SpellCheckerUnderlineStyle", 1); -pref("startup.homepage_override_url", ""); -pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=http://start.fedoraproject.org/"); -pref("browser.newtabpage.pinned", '[{"url":"http://start.fedoraproject.org/","title":"Fedora Project - Start Page"}]'); +pref("startup.homepage_override_url", "http://www.redhat.com"); +pref("startup.homepage_welcome_url", "http://www.redhat.com"); +pref("browser.startup.homepage", "data:text/plain,browser.startup.homepage=file:///usr/share/doc/HTML/index.html"); pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%"); pref("media.gmp-gmpopenh264.provider.enabled",false); pref("media.gmp-gmpopenh264.autoupdate",false); diff --git a/SOURCES/firefox.sh.in b/SOURCES/firefox.sh.in index d16f8cb..0e5214e 100644 --- a/SOURCES/firefox.sh.in +++ b/SOURCES/firefox.sh.in @@ -247,6 +247,25 @@ do esac done +# Linux version specific environment variables +%RHEL_ENV_VARS% + +# Make sure at-spi-bus is running +if ! dbus-send --session \ + --dest=org.freedesktop.DBus \ + --type=method_call \ + --print-reply \ + /org/freedesktop/DBus \ + org.freedesktop.DBus.ListNames \ + | grep org.a11y.Bus > /dev/null; then + if [ -f "$MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher" ]; then + echo "Starting a11y dbus service..." + $MOZ_LIB_DIR/firefox/bundled/libexec/at-spi-bus-launcher & + else + echo "Running without a11y support!" + fi +fi + # Run the browser debugging=0 if [ $debugging = 1 ] diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 5890ea3..bf8a9ea 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -1,6 +1,7 @@ # Use system nspr/nss? FIXME %global system_nss 1 %define use_bundled_ffi 0 +%define use_bundled_python 1 # Don't use system hunspell for now %global system_hunspell 0 @@ -15,6 +16,10 @@ %global use_dts 1 %endif +%if 0%{?rhel} == 7 +%define use_bundled_python 0 +%endif + %global use_rustts 1 %global dts_version 7 %global rst_version 7 @@ -26,11 +31,7 @@ %global system_libvpx 0 # Use system libicu? -%if 0%{?fedora} > 27 %global system_libicu 0 -%else -%global system_libicu 0 -%endif # Big endian platforms %ifarch ppc64 s390x @@ -121,8 +122,8 @@ Summary: Mozilla Firefox Web browser Name: firefox -Version: 60.1.0 -Release: 4%{?pre_tag}%{?dist} +Version: 60.2.0 +Release: 1%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ %if 0%{?rhel} == 7 @@ -134,7 +135,7 @@ ExclusiveArch: i686 x86_64 ppc64 s390x Source0: https://hg.mozilla.org/releases/mozilla-release/archive/firefox-%{version}%{?pre_version}.source.tar.xz %if %{build_langpacks} -Source1: firefox-langpacks-%{version}%{?pre_version}-20180622.tar.xz +Source1: firefox-langpacks-%{version}%{?pre_version}-20180831.tar.xz %endif Source10: firefox-mozconfig Source12: firefox-redhat-default-prefs.js @@ -177,7 +178,6 @@ Patch44: firefox-disable-dbus-remote.patch # Fedora/RHEL specific patches Patch215: firefox-enable-addons.patch Patch219: rhbz-1173156.patch -Patch221: firefox-fedora-ua.patch Patch224: mozilla-1170092.patch Patch225: mozilla-1005640-accept-lang.patch #ARM run-time patch @@ -252,9 +252,11 @@ BuildRequires: rust-toolset-%{rst_version}-rust BuildRequires: llvm-toolset-%{dts_version} BuildRequires: llvm-toolset-%{dts_version}-llvm-devel %endif -%if 0%{?rhel} == 6 +%if 0%{?use_bundled_python} +#%if 0%{?rhel} == 6 # Needed for Python in RHEL6 BuildRequires: openssl-devel +#%endif %endif %if 0%{?bundle_gtk3} @@ -290,6 +292,13 @@ BuildRequires: mesa-libEGL-devel BuildRequires: pixman-devel BuildRequires: rest-devel BuildRequires: readline-devel +# TODO: We miss that dependency in our bundled gtk3 package. +# As a hotfix we put it here and fix gtk3 in next release. +Requires: mesa-libEGL%{?_isa} +Requires: libcroco%{?_isa} +Requires: mesa-libGL%{?_isa} +Requires: bzip2-libs%{?_isa} +Requires: libXtst%{?_isa} %else BuildRequires: gtk3-devel BuildRequires: glib2-devel @@ -301,14 +310,9 @@ Requires: p11-kit-trust Requires: nspr >= %{nspr_build_version} Requires: nss >= %{nss_build_version} %endif -BuildRequires: python2-devel -%if 0%{?fedora} > 25 -# For early testing of rhbz#1400293 mozbz#1324096 on F26 and Rawhide, -# temporarily require the specific NSS build with the backports. -# Can be removed after firefox is changed to require NSS 3.30. -BuildRequires: nss-devel >= 3.29.1-2.1 -Requires: nss >= 3.29.1-2.1 +%if 0%{?rhel} < 8 +BuildRequires: python2-devel %endif BuildRequires: desktop-file-utils @@ -393,7 +397,6 @@ This package contains results of tests executed during build. # Fedora patches %patch215 -p1 -b .addons %patch219 -p2 -b .rhbz-1173156 -%patch221 -p2 -b .fedora-ua %patch224 -p1 -b .1170092 %patch225 -p1 -b .1005640-accept-lang @@ -468,12 +471,9 @@ echo "ac_add_options --enable-debug" >> .mozconfig echo "ac_add_options --disable-optimize" >> .mozconfig %else %global optimize_flags "none" -# Fedora 26 (gcc7) needs to disable default build flags (mozbz#1342344) -%if 0%{?fedora} > 25 %ifnarch s390 s390x %global optimize_flags "-g -O2" %endif -%endif %ifarch armv7hl # ARMv7 need that (rhbz#1426850) %global optimize_flags "-g -O2 -fno-schedule-insns" @@ -631,15 +631,16 @@ function build_bundled_package() { %endif # If needed build the bundled python 2.7 and put it in the PATH -if [ $(python --version 2>&1 | awk '{ print substr ($2, 0, 3) }') = "2.6" ]; then +%if 0%{?use_bundled_python} pushd %{_builddir}/python/Python-%{bundled_python_version} #if ! 0%{?avoid_bundled_rebuild} # Build Python 2.7 and set environment - ./configure --prefix="%{_buildrootdir}" --exec-prefix="%{_buildrootdir}" --libdir="%{_buildrootdir}/lib" + # Pydebug set optimization to level 0, -O3 crashes on gcc 8 ATM + ./configure --with-pydebug --prefix="%{_buildrootdir}" --exec-prefix="%{_buildrootdir}" --libdir="%{_buildrootdir}/lib" #endif make %{?_smp_mflags} install V=1 popd -fi +%endif %if 0%{?bundle_gtk3} # gtk3-private-3.22.26.el6-1-requires-provides-filter.inc @@ -856,6 +857,12 @@ desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE20} # set up the firefox start script %{__rm} -rf %{buildroot}%{_bindir}/firefox %{__cat} %{SOURCE21} > %{buildroot}%{_bindir}/firefox +%if 0%{?bundle_gtk3} +sed -i -e 's|%RHEL_ENV_VARS%|export XDG_DATA_DIRS="$MOZ_LIB_DIR/firefox/bundled/share:/usr/share:$XDG_DATA_DIRS"|' %{buildroot}%{_bindir}/firefox +%else +sed -i -e 's|%RHEL_ENV_VARS%||' %{buildroot}%{_bindir}/firefox +%endif + %{__chmod} 755 %{buildroot}%{_bindir}/firefox %{__install} -p -D -m 644 %{SOURCE23} %{buildroot}%{_mandir}/man1/firefox.1 @@ -1135,6 +1142,27 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Aug 31 2018 Jan Horak - 60.2.0-1 +- Update to 60.2.0 ESR + +* Tue Aug 28 2018 Jan Horak - 60.1.0-9 +- Do not set user agent (rhbz#1608065) +- GTK dialogs are localized now (rhbz#1619373) +- JNLP association works again (rhbz#1607457) + +* Thu Aug 16 2018 Jan Horak - 60.1.0-8 +- Fixed homepage and bookmarks (rhbz#1606778) +- Fixed missing file associations in RHEL6 (rhbz#1613565) + +* Thu Jul 12 2018 Jan Horak - 60.1.0-7 +- Run at-spi-bus if not running already (for the bundled gtk3) + +* Mon Jul 9 2018 Jan Horak - 60.1.0-6 +- Fix for missing schemes for bundled gtk3 + +* Mon Jun 25 2018 Martin Stransky - 60.1.0-5 +- Added mesa-libEGL dependency to gtk3/rhel6 + * Sun Jun 24 2018 Martin Stransky - 60.1.0-4 - Disabled jemalloc on all second arches @@ -1239,4 +1267,3 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : * Thu Dec 8 2016 Jan Horak - 52.0-0.5 - Firefox Aurora 52 testing build -