Author: hobbes1069 Update of /cvs/free/rpms/avidemux/F-19 In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv32637 Modified Files: avidemux.spec sources Removed Files: avidemux-2.5.6-ffmpeg_parallel_build.patch avidemux-2.6.4-gtk_fix.patch Log Message: * Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.7-1 - Update to latest upstream release. - Obsolete unneeded devel subpackage. Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-19/avidemux.spec,v retrieving revision 1.82 retrieving revision 1.83 diff -u -r1.82 -r1.83 --- avidemux.spec 30 Jun 2013 11:45:59 -0000 1.82 +++ avidemux.spec 13 Mar 2014 17:34:39 -0000 1.83 @@ -1,8 +1,8 @@ %global _pkgbuilddir %{_builddir}/%{name}_%{version} Name: avidemux -Version: 2.6.4 -Release: 5%{?dist} +Version: 2.6.7 +Release: 1%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ @@ -11,11 +11,9 @@ Source1: avidemux-qt.desktop Source2: avidemux-gtk.desktop -#Patch0: avidemux-2.5.6-ffmpeg_parallel_build.patch -Patch1: avidemux-2.6-bundled_libs.patch -Patch2: avidemux3-libass.patch -Patch3: avidemux3-bundled_libs.patch -Patch4: avidemux-2.6.4-gtk_fix.patch +Patch0: avidemux-2.6-bundled_libs.patch +Patch1: avidemux3-libass.patch +Patch2: avidemux3-bundled_libs.patch # Don't try to build on arm ExcludeArch: %{arm} @@ -68,7 +66,8 @@ BuildRequires: ffmpeg-devel # Main package is a metapackage, bring in something useful. -Requires: avidemux-gui = %{version}-%{release} +Requires: %{name}-gui = %{version}-%{release} +Requires: %{name}-help = %{version}-%{release} %description @@ -92,6 +91,7 @@ Summary: Libraries for %{name} Group: System Environment/Libraries #Requires: %{name}%{?_isa} = %{version}-%{release} +Obsoletes: avidemux-devel < 2.6.4-9 %description libs This package contains the runtime libraries for %{name}. @@ -103,7 +103,6 @@ BuildRequires: cairo-devel Provides: %{name}-gui = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-help = %{version}-%{release} %description gtk This package provides the GTK graphical interface for %{name}. @@ -116,7 +115,6 @@ BuildRequires: qt4-devel >= 4.5.0-9 Provides: %{name}-gui = %{version}-%{release} Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: %{name}-help = %{version}-%{release} %description qt This package contains the Qt graphical interface for %{name}. @@ -130,13 +128,6 @@ %description help This package contains the help files for %{name}. -%package devel -Summary: Development files for %{name} -Group: Development/Libraries -Requires: %{name}-libs%{?_isa} = %{version}-%{release} - -%description devel -This package contains files required to develop with or extend %{name}. %package i18n Summary: Translations for %{name} @@ -150,11 +141,9 @@ %prep %setup -q -n %{name}_%{version} -#patch0 -p1 -b .ffmpeg_build -%patch1 -p1 -b .bund_libs -%patch2 -p1 -b .libass -%patch3 -p1 -b .bund_libs2 -%patch4 -p1 -b .gtk_fix +%patch0 -p1 -b .bund_libs +%patch1 -p1 -b .libass +%patch2 -p1 -b .bund_libs2 # Remove sources of bundled libraries. rm -rf avidemux_plugins/ADM_audioDecoders/ADM_ad_ac3/ADM_liba52 \ @@ -165,7 +154,7 @@ %build # Build avidemux_core -LDFLAGS="-Wl,--as-needed";export LDFLAGS +LDFLAGS="-lc -Wl,--as-needed";export LDFLAGS rm -rf build_core && mkdir build_core && pushd build_core %cmake -DCMAKE_BUILD_TYPE=RelWithDebInfo \ ../avidemux_core @@ -275,6 +264,9 @@ make -C build_plugins_qt4 install DESTDIR=%{buildroot} make -C build_plugins_gtk install DESTDIR=%{buildroot} +# Remove useless devel files +rm -rf %{buildroot}%{_includedir}/%{name} + # FFMpeg libraries are not being installed as executable. chmod +x %{buildroot}%{_libdir}/libADM6*.so.* @@ -306,7 +298,6 @@ /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null || : /usr/bin/update-desktop-database &> /dev/null || : - %postun gtk if [ $1 -eq 0 ] ; then /bin/touch --no-create %{_datadir}/icons/hicolor &>/dev/null @@ -330,13 +321,13 @@ %files %doc AUTHORS COPYING README -%dir %{_datadir}/avidemux6 %files libs -f build_plugins_common/install_manifest.txt +%dir %{_datadir}/avidemux6 %{_datadir}/icons/hicolor/*/apps/avidemux.png %{_libdir}/libADM* %exclude %{_libdir}/libADM_render* -%exclude %{_datadir}/avidemux6 +%exclude %{_libdir}/libADM_UI* # Catch the stuff missed using install_manifest.txt %{_libdir}/ADM_plugins6/autoScripts/*.pyc %{_libdir}/ADM_plugins6/autoScripts/*.pyo @@ -345,10 +336,12 @@ %files cli -f build_plugins_cli/install_manifest.txt %{_bindir}/avidemux3_cli +%{_libdir}/libADM_UI_Cli*.so %{_libdir}/libADM_render6_cli.so %files gtk -f build_plugins_gtk/install_manifest.txt %{_bindir}/avidemux3_gtk +%{_libdir}/libADM_UIGtk*.so %{_libdir}/libADM_render6_gtk.so %{_libdir}/ADM_glade/ %{_datadir}/applications/rpmfusion-avidemux-gtk.desktop @@ -356,24 +349,35 @@ %files qt -f build_plugins_qt4/install_manifest.txt %{_bindir}/avidemux3_qt4 %{_bindir}/avidemux3_jobs +%{_libdir}/libADM_UIQT*.so %{_libdir}/libADM_render6_qt4.so %{_datadir}/applications/rpmfusion-avidemux-qt.desktop %files help %{_datadir}/avidemux6/help/ -%files devel -%{_includedir}/avidemux/ - %files i18n %{_datadir}/avidemux6/i18n/ %changelog +* Mon Jan 27 2014 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.7-1 +- Update to latest upstream release. +- Obsolete unneeded devel subpackage. + +* Tue Nov 05 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.6.4-8 +- Rebuilt for x264/FFmpeg + +* Tue Oct 22 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.6.4-7 +- Rebuilt for x264 + +* Sat Jul 20 2013 Nicolas Chauvet <kwizart(a)gmail.com&gt; - 2.6.4-6 +- Rebuilt for x264 + * Mon Jun 24 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.4-5 - Can't have arch requirement on noarch package, fixes BZ#2840. -* Sun Jun 16 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.4-3.1 +* Sun Jun 16 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.4-3 - Move translations to their own subpackage to make use optional, fixes BZ#2825. * Mon Jun 3 2013 Richard Shaw <hobbes1069(a)gmail.com&gt; - 2.6.4-2 Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/F-19/sources,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- sources 27 May 2013 13:43:38 -0000 1.14 +++ sources 13 Mar 2014 17:34:40 -0000 1.15 @@ -1 +1 @@ -adb9110ab230fe13a8e9799f547f2f57 avidemux_2.6.4.tar.gz +830a5115b7007e754cb0afe77469bfa0 avidemux_2.6.7.tar.gz --- avidemux-2.5.6-ffmpeg_parallel_build.patch DELETED --- --- avidemux-2.6.4-gtk_fix.patch DELETED ---