Author: firewing Update of /cvs/free/rpms/avidemux/F-11 In directory se02.es.rpmfusion.net:/tmp/cvs-serv11904/F-11 Modified Files: .cvsignore avidemux.spec sources Log Message: * Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-1.20091010svn - Update to 2.5.1 subversion r5371 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/avidemux/F-11/.cvsignore,v retrieving revision 1.7 retrieving revision 1.8 diff -u -r1.7 -r1.8 --- .cvsignore 12 Sep 2009 03:02:16 -0000 1.7 +++ .cvsignore 10 Oct 2009 06:52:13 -0000 1.8 @@ -1 +1 @@ -avidemux-2.5.1-20090911svn-r5328.tar.bz2 +avidemux-2.5.1-20091010svn-r5371.tar.bz2 Index: avidemux.spec =================================================================== RCS file: /cvs/free/rpms/avidemux/F-11/avidemux.spec,v retrieving revision 1.33 retrieving revision 1.34 diff -u -r1.33 -r1.34 --- avidemux.spec 15 Sep 2009 20:33:06 -0000 1.33 +++ avidemux.spec 10 Oct 2009 06:52:13 -0000 1.34 @@ -1,6 +1,6 @@ Name: avidemux Version: 2.5.1 -Release: 2.20090911svn%{?dist} +Release: 2.20091010svn%{?dist} Summary: Graphical video editing and transcoding tool Group: Applications/Multimedia @@ -8,19 +8,17 @@ URL: http://www.avidemux.org/ #Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz # svn co svn://svn.berlios.de/avidemux/branches/avidemux_2.5_branch_gruntster -# svn export avidemux_2.5_branch_gruntster avidemux-2.5.1-20090911svn-r5328 -# pushd avidemux-2.5.1-20090911svn-r5328/avidemux/ADM_libraries +# svn export avidemux_2.5_branch_gruntster avidemux-2.5.1-20091010svn-r5371 +# pushd avidemux-2.5.1-20091010svn-r5371/avidemux/ADM_libraries # rm {ffmpeg,libswscale}*.tar.gz ##(cmake/admFFmpegBuild.cmake provides the up-to-date SVN revision numbers) -# svn co svn://svn.ffmpeg.org/ffmpeg/trunk -r 19733 --ignore-externals ffmpeg_r19733 -# svn export --ignore-externals ffmpeg{_r19733,} -# tar cfz ffmpeg.tar.gz ffmpeg && rm -rf ffmpeg{_r19733,} -# svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale -r 29569 libswscale_r29569 -# svn export libswscale{_r29569,} -# tar cfz libswscale.tar.gz libswscale && rm -rf libswscale{_r29569,} -# popd -# tar cfj avidemux-2.5.1-20090911svn-r5328.tar.bz2 avidemux-2.5.1-20090911svn-r5328 -Source0: avidemux-%{version}-20090911svn-r5328.tar.bz2 +# svn co svn://svn.ffmpeg.org/ffmpeg/trunk -r 19894 --ignore-externals ffmpeg_r19894 +# svn export ffmpeg{_r19894,} --ignore-externals +# tar cfz ffmpeg_r19894.tar.gz ffmpeg && rm -rf ffmpeg{,_r19894} +# svn co svn://svn.ffmpeg.org/mplayer/trunk/libswscale -r 29686 libswscale_r29686 +# svn export libswscale{_r29686,} +# tar cfz libswscale_r29686.tar.gz libswscale && rm -rf libswscale{,_r29686} +Source0: avidemux-%{version}-20091010svn-r5371.tar.bz2 Source1: %{name}-gtk.desktop Source2: %{name}-qt.desktop # Patch0 obtained from avidemux-2.5.0-patches-1.tar.bz2: @@ -154,7 +152,7 @@ This package contains various plugins for avidemux. %prep -%setup -q -n avidemux-%{version}-20090911svn-r5328 +%setup -q -n avidemux-%{version}-20091010svn-r5371 # change hardcoded libdir paths %ifarch x86_64 ppc64 @@ -174,14 +172,14 @@ # Out of source build mkdir build && cd build %cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ - -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328" \ - -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328/build/config" \ + -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \ + -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \ .. make %{?_smp_mflags} mkdir ../build_plugins && cd ../build_plugins %cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \ - -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328" \ - -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20090911svn-r5328/build/config" \ + -DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \ + -DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config" \ ../plugins make %{?_smp_mflags} @@ -248,6 +246,9 @@ %{_includedir}/ADM_coreConfig.h %changelog +* Sat Oct 10 2009 Stewart Adam <s.adam at diffingo.com> - 2.5.1-2.20091010svn +- Update to 2.5.1 subversion r5371 + * Tue Sep 15 2009 Stewart Adam <s.adam at diffingo.com> 2.5.1-2.20090911svn - Bump for rebuild Index: sources =================================================================== RCS file: /cvs/free/rpms/avidemux/F-11/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 13 Sep 2009 17:14:18 -0000 1.8 +++ sources 10 Oct 2009 06:52:13 -0000 1.9 @@ -1 +1 @@ -3b1bebf9fc2eb4b178a691e7b55f77de avidemux-2.5.1-20090911svn-r5328.tar.bz2 +6441ce265896fda78e845d296f14f20e avidemux-2.5.1-20091010svn-r5371.tar.bz2