Merge branch 'master' into f26

This commit is contained in:
Martin Stransky 2017-08-02 13:22:47 +02:00
commit c8bc624f9a
2 changed files with 1 additions and 6 deletions

View File

@ -15,8 +15,6 @@ ac_add_options --enable-startup-notification
#ac_add_options --disable-cpp-exceptions
ac_add_options --disable-updater
ac_add_options --enable-url-classifier
ac_add_options --enable-gio
#ac_add_options --disable-gnomevfs
ac_add_options --enable-chrome-format=omni
ac_add_options --enable-pulseaudio
ac_add_options --with-system-icu

View File

@ -788,10 +788,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{mozappdir}/browser/chrome
%{mozappdir}/browser/chrome.manifest
%{mozappdir}/browser/defaults/preferences/firefox-redhat-default-prefs.js
%{mozappdir}/browser/features/e10srollout@mozilla.org.xpi
%{mozappdir}/browser/features/firefox@getpocket.com.xpi
%{mozappdir}/browser/features/webcompat@mozilla.org.xpi
%{mozappdir}/browser/features/screenshots@mozilla.org.xpi
%{mozappdir}/browser/features/*.xpi
%{mozappdir}/distribution/distribution.ini
# That's Windows only
%ghost %{mozappdir}/browser/features/aushelper@mozilla.org.xpi