SPECS: avidemux.spec - merged from DEVEL

[sls]

Author: sls                          Date: Sat Jan  6 20:35:36 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- merged from DEVEL

---- Files affected:
SPECS:
   avidemux.spec (1.43 -> 1.44) 

---- Diffs:

================================================================
Index: SPECS/avidemux.spec
diff -u SPECS/avidemux.spec:1.43 SPECS/avidemux.spec:1.44
--- SPECS/avidemux.spec:1.43	Thu Jan  4 17:30:59 2007
+++ SPECS/avidemux.spec	Sat Jan  6 21:35:30 2007
@@ -2,14 +2,17 @@
 Summary:	A small audio/video editing software for Linux
 Summary(pl):	Mały edytor audio/wideo dla Linuksa
 Name:		avidemux
-Version:	2.1.2
-Release:	2
+Version:	2.3.0
+Release:	0.1
 License:	GPL v2
 Group:		X11/Applications/Multimedia
-Source0:	http://download.berlios.de/avidemux/%{name}-%{version}.tar.gz
-# Source0-md5:	727214aacdf729506a13d0e0117f01de
+Source0:	http://download2.berlios.de/avidemux/%{name}_%{version}.tar.gz
+# Source0-md5:	14c58c14fc9757d36e4d72498431da42
 Source1:	%{name}.desktop
 Patch0:		%{name}-autoconf.patch
+Patch1:		%{name}-dts_internal.patch
+Patch2:		%{name}-compile.patch
+Patch3:		%{name}-as_needed.patch
 URL:		http://fixounet.free.fr/avidemux/
 BuildRequires:	SDL-devel
 BuildRequires:	a52dec-libs-devel
@@ -23,8 +26,9 @@
 BuildRequires:	freetype-devel >= 2.0.0
 BuildRequires:	gettext-devel
 BuildRequires:	gtk+2-devel >= 1:2.6.0
-BuildRequires:	js-devel
+BuildRequires:	js-devel(threads)
 BuildRequires:	lame-libs-devel
+BuildRequires:	libdts-devel
 BuildRequires:	libmad-devel
 BuildRequires:	libmpeg3-devel
 BuildRequires:	libstdc++-devel
@@ -32,7 +36,9 @@
 BuildRequires:	libxml2-devel
 BuildRequires:	pkgconfig
 BuildRequires:	sed >= 4.0
+BuildRequires:	xorg-lib-libXv-devel
 BuildRequires:	xvid-devel >= 1:1.0
+Requires:	js(threads)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -42,8 +48,11 @@
 Mały edytor audio/wideo dla Linuksa.
 
 %prep
-%setup -q
+%setup -q -n %{name}_%{version}
 %patch0 -p1
+%patch1 -p0
+%patch2 -p1
+%patch3 -p1
 
 %{__sed} -i 's/charset=Unicode/charset=UTF-8/' po/ru.po
 %{__sed} -i 's/klingon/de\npt_BR/' po/LINGUAS
@@ -56,9 +65,9 @@
 %ifarch ppc
 	--enable-altivec \
 %endif
-	--with-newfaad \
 	--with-jsapi-include=%{_includedir}/js \
 	--disable-static
+
 %{__make}
 
 %install
@@ -89,6 +98,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.44  2007/01/06 20:35:30  sls
+- merged from DEVEL
+
 Revision 1.43  2007/01/04 16:30:59  arekm
 - better am/ac rebuild
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/avidemux.spec?r1=1.43&r2=1.44&f=u