rpms/firefox
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into f24

Browse Source
This commit is contained in:
Martin Stransky 2016-04-26 13:34:56 +02:00
commit aa52b610da
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firefox.spec
View File

@ -18,6 +18,13 @@
%define system_libvpx 0 %define system_libvpx 0
%endif %endif
# Use system libicu?
%if 0%{?fedora} > 23
%define system_libicu 1
%else
%define system_libicu 0
%endif
# Hardened build? # Hardened build?
%if 0%{?fedora} > 20 %if 0%{?fedora} > 20
%define hardened_build 1 %define hardened_build 1
@ -87,7 +94,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 46.0 Version: 46.0
Release: 1%{?pre_tag}%{?dist} Release: 2%{?pre_tag}%{?dist}
URL: https://www.mozilla.org/projects/firefox/ URL: https://www.mozilla.org/projects/firefox/
License: MPLv1.1 or GPLv2+ or LGPLv2+ License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet Group: Applications/Internet
@ -399,6 +406,12 @@ echo "ac_add_options --with-system-libvpx" >> .mozconfig
echo "ac_add_options --without-system-libvpx" >> .mozconfig echo "ac_add_options --without-system-libvpx" >> .mozconfig
%endif %endif
%if %{?system_libicu}
echo "ac_add_options --with-system-icu" >> .mozconfig
%else
echo "ac_add_options --without-system-icu" >> .mozconfig
%endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%build %build
@ -794,6 +807,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Apr 26 2016 Martin Stransky <stransky@redhat.com> - 46.0-2
- Disabled system libicu on Fedora 22/23
* Mon Apr 25 2016 Martin Stransky <stransky@redhat.com> - 46.0-1 * Mon Apr 25 2016 Martin Stransky <stransky@redhat.com> - 46.0-1
- Updated to 46.0 (B5) - Updated to 46.0 (B5)