4:57 a.m.
Author: firewing
Update of /cvs/free/rpms/avidemux/F-10
In directory se02.es.rpmfusion.net:/tmp/cvs-serv5613/F-10
Modified Files:
.cvsignore avidemux.spec sources
Added Files:
avidemux-2.4-pulseaudio-default.patch avidemux-2.4-qt4.patch
Removed Files:
avidemux-2.4.2-pulseaudio-default.patch
avidemux-2.4.3-ppc.patch avidemux-2.4.3-qt4.patch
Log Message:
* Wed Feb 18 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-1
- Update to 2.4.4 final, update patches accordingly
- Move Qt translation files to qt subpackage
avidemux-2.4-pulseaudio-default.patch:
--- NEW FILE avidemux-2.4-pulseaudio-default.patch ---
--- avidemux_2.4.4.orig/avidemux/prefs.in 2008-07-23 12:47:32.000000000 -0400
+++ avidemux_2.4.4/avidemux/prefs.in 2009-02-19 00:02:46.000000000 -0500
@@ -55,7 +55,7 @@
#else
device.audiodevice, STRING, ALSA
#endif
-device.audio.alsa_device, STRING, "dmix"
+device.audio.alsa_device, STRING, "pulse"
device.videodevice, UINT, 0, 0, 10
# Posproc
default.postproc_type, UINT, 3, 0, 7
avidemux-2.4-qt4.patch:
--- NEW FILE avidemux-2.4-qt4.patch ---
--- avidemux_2.4.4.orig/cmake/Ts.cmake 2007-10-14 07:58:28.000000000 -0400
+++ avidemux_2.4.4/cmake/Ts.cmake 2009-02-19 00:07:13.000000000 -0500
@@ -14,7 +14,7 @@
MACRO(FIND_LRELEASE)
IF(NOT LRELEASE_EXECUTABLE AND NOT LRELEASE_NOT_FOUND)
- FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease PATHS
+ FIND_PROGRAM(LRELEASE_EXECUTABLE lrelease-qt4 PATHS
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
"[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
$ENV{QTDIR}/bin)
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-10/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- .cvsignore 16 Aug 2008 20:07:42 -0000 1.3
+++ .cvsignore 20 Feb 2009 04:56:42 -0000 1.4
@@ -1 +1 @@
-avidemux_2.4.3.tar.gz
+avidemux_2.4.4.tar.gz
Index: avidemux.spec
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-10/avidemux.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- avidemux.spec 26 Nov 2008 00:45:47 -0000 1.9
+++ avidemux.spec 20 Feb 2009 04:56:42 -0000 1.10
@@ -1,8 +1,8 @@
#define svndate 20080521
Name: avidemux
-Version: 2.4.3
-Release: 7%{?dist}
+Version: 2.4.4
+Release: 1%{?dist}
Summary: Graphical video editing and transcoding tool
Group: Applications/Multimedia
@@ -11,15 +11,14 @@
Source0: http://download.berlios.de/avidemux/avidemux_%{version}.tar.gz
Source1: %{name}-gtk.desktop
Source2: %{name}-qt.desktop
-Patch0: avidemux-2.4.2-pulseaudio-default.patch
-Patch1: avidemux-2.4.3-qt4.patch
+# Make PulseAudio the default audio out device
+Patch0: avidemux-2.4-pulseaudio-default.patch
+# Search for lrelease-qt4 instead of lrelease
+Patch1: avidemux-2.4-qt4.patch
+# Why are i18n files stored in bindir? Move to datadir...
Patch2: avidemux-2.4-i18n.patch
#
http://ftp.ncnu.edu.tw/Linux/Gentoo/gentoo-portage/media-video/avidemux/f...
Patch3: avidemux-2.4-libdca.patch
-# http://avidemux.org/admForum/viewtopic.php?pid=29582#p29582
-# http://avidemux.org/admForum/viewtopic.php?id=3991
-Patch4: avidemux-2.4.3-ppc.patch
-#http://bugs.gentoo.org/attachment.cgi?id=160132&action=view
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Requires: %{name}-cli = %{version}
@@ -113,11 +112,10 @@
%prep
%setup -q -n avidemux_%{version}
-%patch0 -b .pulse
-%patch1 -b .qt4
-%patch2 -b .i18n
-%patch3 -b .libdca
-%patch4 -b .ppc
+%patch0 -p1 -b .pulse
+%patch1 -p1 -b .qt4
+%patch2 -p1 -b .i18n
+%patch3 -p1 -b .libdca
%build
%cmake
@@ -144,7 +142,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING ChangeLog History README TODO
-%{_datadir}/%{name}/
+%dir %{_datadir}/%{name}
%files cli
%defattr(-,root,root,-)
@@ -157,10 +155,16 @@
%files qt
%defattr(-,root,root,-)
+%dir %{_datadir}/%{name}/i18n/
+%{_datadir}/%{name}/i18n/*.qm
%{_bindir}/avidemux2_qt4
%{_datadir}/applications/*qt*.desktop
%changelog
+* Wed Feb 18 2009 Stewart Adam <s.adam at diffingo.com> - 2.4.4-1
+- Update to 2.4.4 final, update patches accordingly
+- Move Qt translation files to qt subpackage
+
* Tue Nov 25 2008 Stewart Adam <s.adam at diffingo.com> - 2.4.3-7
- Don't uselessly provide avidemux-cli
- Make GUI and CLI subpackages require the main package (fixes bz#178)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/avidemux/F-10/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- sources 16 Aug 2008 16:50:48 -0000 1.3
+++ sources 20 Feb 2009 04:56:42 -0000 1.4
@@ -1 +1 @@
-ff8e6ac186321e7e8bec9f8177df3724 avidemux_2.4.3.tar.gz
+503dfd25842ef81be7c769811e7bc54e avidemux_2.4.4.tar.gz
--- avidemux-2.4.2-pulseaudio-default.patch DELETED ---
--- avidemux-2.4.3-ppc.patch DELETED ---
--- avidemux-2.4.3-qt4.patch DELETED ---