- merged from DEVEL

[packages/avidemux.git] / avidemux.spec

diff --git a/avidemux.spec b/avidemux.spec
index 7f11007e22ee91cd8759308cca43df548cb3e439..d733e43985605c3aa7ce642ce9a3cf9cf4a9f0e7 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,15 +1,17 @@
 Summary:       A small audio/video editing software for Linux
 Summary(pl):   Ma³y edytor audio/wideo dla Linuksa
 Name:          avidemux
-Version:       2.0.42
-Release:       1
+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: d30f1bb981767bca793d78067bcfe084
+Source0:       http://download2.berlios.de/avidemux/%{name}_%{version}.tar.gz
+# Source0-md5: 14c58c14fc9757d36e4d72498431da42
 Source1:       %{name}.desktop
-Source2:       %{name}.png
 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
@@ -22,8 +24,10 @@ BuildRequires:       faad2-devel
 BuildRequires: ffmpeg-devel
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: gettext-devel
-BuildRequires: gtk+2-devel >= 1:2.0.0
+BuildRequires: gtk+2-devel >= 1:2.6.0
+BuildRequires: js-devel(threads)
 BuildRequires: lame-libs-devel
+BuildRequires: libdts-devel
 BuildRequires: libmad-devel
 BuildRequires: libmpeg3-devel
 BuildRequires: libstdc++-devel
@@ -31,7 +35,9 @@ BuildRequires:        libvorbis-devel
 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
@@ -41,24 +47,26 @@ A small audio/video editing software for Linux.
 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//' po/LINGUAS
+%{__sed} -i 's/klingon/de\npt_BR/' po/LINGUAS
 
 %build
-cp /usr/share/automake/config.sub admin
-%{__gettextize}
-%{__aclocal} -I m4
-%{__autoheader}
-%{__automake}
-%{__autoconf}
+export kde_htmldir=%{_kdedocdir}
+export kde_libs_htmldir=%{_kdedocdir}
+%{__make} -f admin/Makefile.common cvs
 %configure \
 %ifarch ppc
        --enable-altivec \
 %endif
+       --with-jsapi-include=%{_includedir}/js \
        --disable-static
+
 %{__make}
 
 %install
@@ -69,7 +77,7 @@ install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}}
        DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
-install %{SOURCE2} $RPM_BUILD_ROOT%{_pixmapsdir}
+install avidemux_icon.png $RPM_BUILD_ROOT%{_pixmapsdir}/%{name}.png
 
 %find_lang %{name}