commit 03df63209d04653c754cbf396a2794db6993e6b0 Merge: c348a7f 1781867 Author: sagitter <sagitter(a)fedoraproject.org&gt; Date: Thu Dec 6 22:52:57 2018 +0100 Rebuild for ffmpeg-3.4.5 on el7 .gitignore | 9 +- avidemux-2.6-bundled_libs.patch | 44 ----- avidemux-gtk.desktop | 9 - avidemux-qt.desktop | 2 +- avidemux.spec | 375 ++++++++++++++++++++++---------------- avidemux3-bundled_libs.patch | 88 --------- rpmfusion-avidemux-qt.appdata.xml | 28 +++ sources | 4 + 8 files changed, 261 insertions(+), 298 deletions(-) --- diff --cc avidemux.spec index d17dbca,d2f2f91..8b6ac42 --- a/avidemux.spec +++ b/avidemux.spec @@@ -257,18 -209,16 +209,19 @@@ pop %install - make -C build_core install DESTDIR=%{buildroot} - make -C build_cli install DESTDIR=%{buildroot} - make -C build_qt4 install DESTDIR=%{buildroot} - make -C build_gtk install DESTDIR=%{buildroot} - make -C build_plugins_common install DESTDIR=%{buildroot} - make -C build_plugins_cli install DESTDIR=%{buildroot} - make -C build_plugins_qt4 install DESTDIR=%{buildroot} - make -C build_plugins_gtk install DESTDIR=%{buildroot} + %make_install -C build_core + %make_install -C build_cli + %make_install -C build_qt5 + %make_install -C build_plugins_common + %make_install -C build_plugins_cli + %make_install -C build_plugins_qt5 + + # Remove useless devel files + rm -rf %{buildroot}%{_includedir}/%{name} +# Remove useless devel files +rm -rf %{buildroot}%{_includedir}/%{name} + # FFMpeg libraries are not being installed as executable. chmod +x %{buildroot}%{_libdir}/libADM6*.so.* diff --cc sources index 28f152e,9c39b52..4a8b947 --- a/sources +++ b/sources @@@ -1,1 -1,1 +1,5 @@@ ++<<<<<<< HEAD +33d0cd47cb84a4e9f4e1b3160405c85c avidemux_2.6.8.tar.gz ++======= + e3510c858c9371283551b1b4b67d288b avidemux_2.7.1.tar.gz ++>>>>>>> master