From 87be972318175ff7eb8f1b3bd5944ce49f7178fc Mon Sep 17 00:00:00 2001 From: Johnny Hughes Date: Sep 22 2016 13:12:43 +0000 Subject: add back ffmpeg for centos plus --- diff --git a/SPECS/firefox.spec b/SPECS/firefox.spec index 608dd1a..526249e 100644 --- a/SPECS/firefox.spec +++ b/SPECS/firefox.spec @@ -527,7 +527,7 @@ function add_to_mozconfig() { %endif #Disabled due to rhbz#1330898 -add_to_mozconfig "disable-ffmpeg" +#add_to_mozconfig "disable-ffmpeg" #FIXME RTTI?? RHEL5/6 # ac_add_options --enable-cpp-rtti @@ -948,9 +948,16 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %{mozappdir}/libsoftokn3.chk %endif +# Add in CentOS for ffmpeg +%{mozappdir}/gmp-clearkey/0.1/clearkey.info +%{mozappdir}/gmp-clearkey/0.1/libclearkey.so + #--------------------------------------------------------------------- %changelog +* Wed Sep 21 2016 Johnny Hughes - 45.4.0-1.el7.centos.plus +- add back in ffmpeg + * Wed Sep 21 2016 CentOS Sources - 45.4.0-1.el7.centos - CentOS default prefs