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

rawhide build fix

Browse Source
This commit is contained in:
Martin Stransky 2014-11-04 14:51:27 +01:00
parent 679cc42f43
commit 793ab2260d
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
firefox-mozconfig
View File

@ -2,7 +2,6 @@
ac_add_options --prefix="$PREFIX" ac_add_options --prefix="$PREFIX"
ac_add_options --libdir="$LIBDIR" ac_add_options --libdir="$LIBDIR"
ac_add_options --with-system-jpeg
ac_add_options --with-system-zlib ac_add_options --with-system-zlib
ac_add_options --with-system-bz2 ac_add_options --with-system-bz2
ac_add_options --with-system-libvpx ac_add_options --with-system-libvpx

12
firefox.spec
View File

@ -105,7 +105,7 @@
Summary: Mozilla Firefox Web browser Summary: Mozilla Firefox Web browser
Name: firefox Name: firefox
Version: 33.0 Version: 33.0
Release: 3%{?pre_tag}%{?dist} Release: 4%{?pre_tag}%{?dist}
URL: http://www.mozilla.org/projects/firefox/ URL: http://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
@ -405,6 +405,13 @@ echo "ac_add_options --disable-crashreporter" >> .mozconfig
echo "ac_add_options --enable-tests" >> .mozconfig echo "ac_add_options --enable-tests" >> .mozconfig
%endif %endif
# Hack - FF does not support new jpeg turbo library
%if 0%{?fedora} > 21
echo "ac_add_options --without-system-jpeg" >> .mozconfig
%else
echo "ac_add_options --with-system-jpeg" >> .mozconfig
%endif
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%build %build
@ -754,6 +761,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
#--------------------------------------------------------------------- #---------------------------------------------------------------------
%changelog %changelog
* Tue Nov 4 2014 Martin Stransky <stransky@redhat.com> - 33.0-4
- Do not use system libjpeg-turbo on rawhide
* Mon Nov 3 2014 Martin Stransky <stransky@redhat.com> - 33.0-3 * Mon Nov 3 2014 Martin Stransky <stransky@redhat.com> - 33.0-3
- Added Gtk3 support - Added Gtk3 support