- merged from DEVEL

Changed files:
    avidemux.spec -> 1.44

diff --git a/avidemux.spec b/avidemux.spec
index f7ef47ea19b2d63975e29feff321f040cf0b90bc..d733e43985605c3aa7ce642ce9a3cf9cf4a9f0e7 100644 (file)
--- a/avidemux.spec
+++ b/avidemux.spec
@@ -1,14 +1,17 @@
 Summary:       A small audio/video editing software for Linux
 Summary(pl):   Ma³y edytor audio/wideo dla Linuksa
 Name:          avidemux
 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
 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
 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
 URL:           http://fixounet.free.fr/avidemux/
 BuildRequires: SDL-devel
 BuildRequires: a52dec-libs-devel


@@ -22,8 +25,9 @@ BuildRequires:        ffmpeg-devel
 BuildRequires: freetype-devel >= 2.0.0
 BuildRequires: gettext-devel
 BuildRequires: gtk+2-devel >= 1:2.6.0
 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: lame-libs-devel

+BuildRequires: libdts-devel

 BuildRequires: libmad-devel
 BuildRequires: libmpeg3-devel
 BuildRequires: libstdc++-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: libxml2-devel
 BuildRequires: pkgconfig
 BuildRequires: sed >= 4.0

+BuildRequires: xorg-lib-libXv-devel

 BuildRequires: xvid-devel >= 1:1.0
 BuildRequires: xvid-devel >= 1:1.0

+Requires:      js(threads)

 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description


@@ -41,8 +47,11 @@ A small audio/video editing software for Linux.
 Ma³y edytor audio/wideo dla Linuksa.
 
 %prep
 Ma³y edytor audio/wideo dla Linuksa.
 
 %prep

-%setup -q
+%setup -q -n %{name}_%{version}

 %patch0 -p1
 %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
 
 %{__sed} -i 's/charset=Unicode/charset=UTF-8/' po/ru.po
 %{__sed} -i 's/klingon/de\npt_BR/' po/LINGUAS


@@ -55,9 +64,9 @@ export kde_libs_htmldir=%{_kdedocdir}
 %ifarch ppc
        --enable-altivec \
 %endif
 %ifarch ppc
        --enable-altivec \
 %endif

-       --with-newfaad \

        --with-jsapi-include=%{_includedir}/js \
        --disable-static
        --with-jsapi-include=%{_includedir}/js \
        --disable-static

+

 %{__make}
 
 %install
 %{__make}
 
 %install