Merge branch 'master' into f24
This commit is contained in:
commit
293fe7d977
14
firefox.spec
14
firefox.spec
@ -1,3 +1,6 @@
|
|||||||
|
# Use ALSA backend?
|
||||||
|
%define alsa_backend 0
|
||||||
|
|
||||||
# Use system nspr/nss?
|
# Use system nspr/nss?
|
||||||
%define system_nss 1
|
%define system_nss 1
|
||||||
|
|
||||||
@ -100,7 +103,7 @@
|
|||||||
Summary: Mozilla Firefox Web browser
|
Summary: Mozilla Firefox Web browser
|
||||||
Name: firefox
|
Name: firefox
|
||||||
Version: 52.0
|
Version: 52.0
|
||||||
Release: 4%{?pre_tag}%{?dist}
|
Release: 5%{?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+
|
||||||
Group: Applications/Internet
|
Group: Applications/Internet
|
||||||
@ -182,7 +185,9 @@ BuildRequires: pkgconfig(xt)
|
|||||||
BuildRequires: pkgconfig(xrender)
|
BuildRequires: pkgconfig(xrender)
|
||||||
BuildRequires: pkgconfig(hunspell)
|
BuildRequires: pkgconfig(hunspell)
|
||||||
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
||||||
|
%if %{?alsa_backend}
|
||||||
BuildRequires: pkgconfig(alsa)
|
BuildRequires: pkgconfig(alsa)
|
||||||
|
%endif
|
||||||
BuildRequires: pkgconfig(libnotify) >= %{libnotify_version}
|
BuildRequires: pkgconfig(libnotify) >= %{libnotify_version}
|
||||||
BuildRequires: pkgconfig(dri)
|
BuildRequires: pkgconfig(dri)
|
||||||
BuildRequires: pkgconfig(libcurl)
|
BuildRequires: pkgconfig(libcurl)
|
||||||
@ -353,6 +358,10 @@ echo "ac_add_options --enable-system-ffi" >> .mozconfig
|
|||||||
echo "ac_add_options --disable-elf-hack" >> .mozconfig
|
echo "ac_add_options --disable-elf-hack" >> .mozconfig
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%if %{?alsa_backend}
|
||||||
|
echo "ac_add_options --enable-alsa" >> .mozconfig
|
||||||
|
%endif
|
||||||
|
|
||||||
%if %{?debug_build}
|
%if %{?debug_build}
|
||||||
echo "ac_add_options --enable-debug" >> .mozconfig
|
echo "ac_add_options --enable-debug" >> .mozconfig
|
||||||
echo "ac_add_options --disable-optimize" >> .mozconfig
|
echo "ac_add_options --disable-optimize" >> .mozconfig
|
||||||
@ -823,6 +832,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
|
|||||||
#---------------------------------------------------------------------
|
#---------------------------------------------------------------------
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Mar 13 2017 Martin Stransky <stransky@redhat.com> - 52.0-5
|
||||||
|
- Enable ALSA backend behind pref (rhbz#1431371)
|
||||||
|
|
||||||
* Fri Mar 10 2017 Martin Stransky <stransky@redhat.com> - 52.0-4
|
* Fri Mar 10 2017 Martin Stransky <stransky@redhat.com> - 52.0-4
|
||||||
- Fixed e10s enablement (rhbz#1398717)
|
- Fixed e10s enablement (rhbz#1398717)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user