9:14 p.m.
Author: firewing
Update of /cvs/free/rpms/avidemux/F-12
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5489/F-12
Modified Files:
.cvsignore avidemux.spec sources
Removed Files:
avidemux-2.5-bf_20091105.patch
Log Message:
* Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2
- Update to 2.5.2 release
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-12/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 10 Oct 2009 06:52:13 -0000 1.5
+++ .cvsignore 18 Jan 2010 21:13:35 -0000 1.6
@@ -1 +1 @@
-avidemux-2.5.1-20091010svn-r5371.tar.bz2
+avidemux_2.5.2.tar.gz
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-12/avidemux.spec,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- avidemux.spec 7 Nov 2009 23:12:35 -0000 1.27
+++ avidemux.spec 18 Jan 2010 21:13:35 -0000 1.28
@@ -1,12 +1,15 @@
+%define _pkgbuilddir %{_builddir}/%{name}_%{version}
+
Name: avidemux
-Version: 2.5.1
-Release: 6.20091010svn%{?dist}
+Version: 2.5.2
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
License: GPLv2+
URL: http://www.avidemux.org/
-#Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
+Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
+## This procedure is used to make a SVN checkout
# svn co svn://svn.berlios.de/avidemux/branches/avidemux_2.5_branch_gruntster
# svn export avidemux_2.5_branch_gruntster avidemux-2.5.1-20091010svn-r5371
# pushd avidemux-2.5.1-20091010svn-r5371/avidemux/ADM_libraries
@@ -20,7 +23,7 @@
# tar cfz libswscale_r29686.tar.gz libswscale && rm -rf libswscale{,_r29686}
# popd
# tar cfj avidemux-2.5.1-20091010svn-r5371.tar.bz2 avidemux-2.5.1-20091010svn-r5371
-Source0: avidemux-%{version}-20091010svn-r5371.tar.bz2
+#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:
@@ -32,7 +35,6 @@
Patch4: avidemux-2.5-libmpeg2enc-altivec.patch
Patch5: avidemux-2.5-checkfunction-includes.patch
Patch6: avidemux-2.5.1-tmplinktarget.patch
-Patch7: avidemux-2.5-bf_20091105.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -156,7 +158,7 @@
This package contains various plugins for avidemux.
%prep
-%setup -q -n avidemux-%{version}-20091010svn-r5371
+%setup -q -n %{name}_%{version}
# change hardcoded libdir paths
%ifarch x86_64 ppc64
@@ -171,26 +173,25 @@
%patch4 -p1 -b .altivec
%patch5 -p1 -b .cfincludes
%patch6 -p0 -b .tmplinktarget
-%patch7 -p0 -b .bf
%build
# Out of source build
mkdir build && cd build
%cmake -DAVIDEMUX_INSTALL_PREFIX=%{_prefix} \
-
-DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \
-
-DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config"
\
+ -DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
+ -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
..
make %{?_smp_mflags}
# Create the temp link directory manuall since otherwise it happens too early
-mkdir %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/%{_lib}
-find %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/avidemux -name
'*.so*' | \
- xargs ln -sft %{_builddir}/avidemux-%{version}-20091010svn-r5371/build/%{_lib}
+mkdir %{_pkgbuilddir}/build/%{_lib}
+find %{_pkgbuilddir}/build/avidemux -name '*.so*' | \
+ xargs ln -sft %{_pkgbuilddir}/build/%{_lib}
mkdir ../build_plugins && cd ../build_plugins
-%cmake
-DAVIDEMUX_INSTALL_PREFIX="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/"
\
-
-DAVIDEMUX_SOURCE_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371" \
-
-DAVIDEMUX_CORECONFIG_DIR="%{_builddir}/avidemux-%{version}-20091010svn-r5371/build/config"
\
+%cmake -DAVIDEMUX_INSTALL_PREFIX="%{_pkgbuilddir}/build/" \
+ -DAVIDEMUX_SOURCE_DIR="%{_pkgbuilddir}" \
+ -DAVIDEMUX_CORECONFIG_DIR="%{_pkgbuilddir}/build/config" \
../plugins
make %{?_smp_mflags}
@@ -257,6 +258,9 @@
%{_includedir}/ADM_coreConfig.h
%changelog
+* Mon Jan 18 2010 Stewart Adam <s.adam at diffingo.com> - 2.5.2
+- Update to 2.5.2 release
+
* Thu Nov 5 2009 Nicolas Chauvet <kwizart(a)fedoraproject.org> -
2.5.1-6.20091010svn
- Update bugfix to 20091105
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-12/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 10 Oct 2009 06:52:13 -0000 1.5
+++ sources 18 Jan 2010 21:13:35 -0000 1.6
@@ -1 +1 @@
-6441ce265896fda78e845d296f14f20e avidemux-2.5.1-20091010svn-r5371.tar.bz2
+9027e1324c06e833e6c3c22298503cc7 avidemux_2.5.2.tar.gz
--- avidemux-2.5-bf_20091105.patch DELETED ---