diff options
Diffstat (limited to 'firefox.spec')
| -rw-r--r-- | firefox.spec | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/firefox.spec b/firefox.spec index d03c7ca..6e13020 100644 --- a/firefox.spec +++ b/firefox.spec @@ -145,10 +145,14 @@ ExcludeArch: s390x %global pre_tag .debug %endif +# Exclude private libraries from autogenerated provides and requires +%global __provides_exclude_from ^%{mozappdir} +%global __requires_exclude ^(%%(find %{buildroot}%{mozappdir} -name '*.so' | xargs -n1 basename | sort -u | paste -s -d '|' -)) + Summary: Mozilla Firefox Web browser Name: firefox Version: 85.0 -Release: 5%{?pre_tag}%{?dist} +Release: 7%{?pre_tag}%{?dist} URL: https://www.mozilla.org/firefox/ License: MPLv1.1 or GPLv2+ or LGPLv2+ Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz @@ -221,12 +225,13 @@ Patch407: mozilla-1667096.patch Patch408: mozilla-1663844.patch Patch415: mozilla-1670333.patch Patch418: mozilla-1556931-s390x-hidden-syms.patch -Patch422: mozilla-1631061.patch Patch423: mozilla-1681107.patch Patch424: firefox-wayland-fix-mzbz-1642949-regression.patch Patch426: mozilla-1687931.patch Patch427: mozilla-1678247.patch Patch428: mozilla-1679933.patch +Patch429: mozilla-1631061-1.patch +Patch430: mozilla-1631061-2.patch # PGO/LTO patches Patch600: pgo.patch @@ -287,7 +292,6 @@ Requires: mozilla-filesystem Recommends: mozilla-openh264 >= 2.1.1 Recommends: libva Requires: p11-kit-trust -Requires: dbus-glib %if %{?system_nss} Requires: nspr >= %{nspr_build_version} Requires: nss >= %{nss_build_version} @@ -439,6 +443,8 @@ This package contains results of tests executed during build. %patch426 -p1 -b .1687931 %patch427 -p1 -b .1678247 %patch428 -p1 -b .1679933 +%patch429 -p1 -b .1631061 +%patch430 -p1 -b .1631061 # PGO patches %if %{build_with_pgo} @@ -716,19 +722,6 @@ xvfb-run ./mach build 2>&1 | cat - make -C objdir buildsymbols %endif -# Don't provide/require bundled libs -%filter_provides_in %{mozappdir}/ -%filter_requires_in %{mozappdir}/ -%filter_provides_in %{mozappdir}/gmp-clearkey/0.1/ -%filter_requires_in %{mozappdir}/gmp-clearkey/0.1/ -%filter_provides_in %{mozappdir}/gtk2 -%filter_requires_in %{mozappdir}/gtk2 -# Do not check .so files in an application-specific library directory -# or any files in the application's data directory for provides -%global __requires_exclude_from ^(%{_libdir}/%{name}/.*\\.so.*|%{_libdir}/%{name}/gmp-clearkey/0.1/.*\\.so.*|%{_libdir}/%{name}/gtk2/.*\\.so.*)$ -%global __provides_exclude_from ^(%{_libdir}/%{name}/.*\\.so.*|%{_libdir}/%{name}/gmp-clearkey/0.1/.*\\.so.*|%{_libdir}/%{name}/gtk2/.*\\.so.*)$ -%global __requires_exclude ^libxul.*$ - # run Firefox test suite %if 0%{?run_firefox_tests} mkdir -p objdir/_virtualenvs/init_py3 @@ -1020,6 +1013,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : #--------------------------------------------------------------------- %changelog +* Fri Jan 29 2021 Martin Stransky <stransky@redhat.com> - 85.0-7 +- Added clipboard fix mozbz#1631061. + +* Thu Jan 28 2021 Kalev Lember <klember@redhat.com> - 85.0-6 +- Make provides/requires filtering smarter/automatic (rhbz#1582116) +- Drop dbus-glib requires that are now automatically generated again + * Thu Jan 28 2021 Martin Stransky <stransky@redhat.com> - 85.0-5 - Add dbus-glib requires. |