rpms/firefox
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added clipboard fix mozbz#1631061.

Browse Source
This commit is contained in:
Martin Stransky 2021-01-30 14:57:30 +01:00
commit 5a70ac803a
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
firefox.spec
View File

@ -145,10 +145,14 @@ ExcludeArch: s390x
%global pre_tag .debug %global pre_tag .debug
%endif %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 Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 85.0 Version: 85.0
Release: 5%{?pre_tag}%{?dist} Release: 7%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/firefox/ URL: https://www.mozilla.org/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ 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 Source0: https://archive.mozilla.org/pub/firefox/releases/%{version}%{?pre_version}/source/firefox-%{version}%{?pre_version}.source.tar.xz
@ -288,7 +292,6 @@ Requires: mozilla-filesystem
Recommends: mozilla-openh264 >= 2.1.1 Recommends: mozilla-openh264 >= 2.1.1
Recommends: libva Recommends: libva
Requires: p11-kit-trust Requires: p11-kit-trust
Requires: dbus-glib
%if %{?system_nss} %if %{?system_nss}
Requires: nspr >= %{nspr_build_version} Requires: nspr >= %{nspr_build_version}
Requires: nss >= %{nss_build_version} Requires: nss >= %{nss_build_version}
@ -719,19 +722,6 @@ xvfb-run ./mach build 2>&1 | cat -
make -C objdir buildsymbols make -C objdir buildsymbols
%endif %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 # run Firefox test suite
%if 0%{?run_firefox_tests} %if 0%{?run_firefox_tests}
mkdir -p objdir/_virtualenvs/init_py3 mkdir -p objdir/_virtualenvs/init_py3
@ -1023,9 +1013,13 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Thu Jan 28 2021 Martin Stransky <stransky@redhat.com> - 85.0-7 * Fri Jan 29 2021 Martin Stransky <stransky@redhat.com> - 85.0-7
- Added clipboard fix mozbz#1631061. - 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 * Thu Jan 28 2021 Martin Stransky <stransky@redhat.com> - 85.0-5
- Add dbus-glib requires. - Add dbus-glib requires.