- added nolibtooltest patch to disable test for libtool 1.4.3 (crashed on 1.4e)

Changed files:
    avifile-nolibtooltest.patch -> 1.1
    avifile.spec -> 1.142

diff --git a/avifile-nolibtooltest.patch b/avifile-nolibtooltest.patch
new file mode 100644 (file)
index 0000000..1e62787
--- /dev/null
+++ b/avifile-nolibtooltest.patch
@@ -0,0 +1,23 @@
+--- avifile0.7-0.7.34/configure.ac.orig        Sat Apr 12 00:44:20 2003
++++ avifile0.7-0.7.34/configure.ac     Sat Apr 12 00:55:18 2003
+@@ -927,11 +927,6 @@
+ CFLAGS=$COPTFLAGS
+ CXXFLAGS=$CXXOPTFLAGS
+ 
+-lt_major_version=`libtool --version 2>&1 | sed 's/\(.*\ \)\([[0-9]]*\.[[0-9]]*\.[[0-9]]*\)\(\ .*\)/\2/'`
+-lt_minor_version=`echo $lt_major_version | cut -d . -f 2`
+-lt_micro_version=`echo $lt_major_version | cut -d . -f 3`
+-lt_major_version=`echo $lt_major_version | cut -d . -f 1`
+-dnl echo LT  $lt_major_version $lt_minor_version $lt_micro_version
+ 
+ AM_CONDITIONAL(AMM_USE_QT, test x$with_qt = xyes )
+ AM_CONDITIONAL(AMM_USE_SDL, test "$with_sdl" = yes)
+@@ -959,7 +954,7 @@
+ AM_CONDITIONAL(AMM_USE_FAST_BUILD, test x$enable_fast_build = xyes )
+ AM_CONDITIONAL(AMM_USE_VIDIX, test x$enable_vidix = xyes )
+ AM_CONDITIONAL(AMM_USE_LINUX, test x$enable_linux = xyes )
+-AM_CONDITIONAL(AMM_LINK_SHARED, test $lt_major_version -ge 1 -a $lt_minor_version -ge 4 -a $lt_micro_version -ge 3 )
++AM_CONDITIONAL(AMM_LINK_SHARED, true )
+ 
+ dnl Arts plugin disabled - it is unusable anyway
+ dnl artsc_config_test_path=$prefix/bin:$exec_prefix/bin:$KDEDIR/bin:$PATH

diff --git a/avifile.spec b/avifile.spec
index 83b951bcfe2afebca4229c7e10e9bc21ae298f9f..75da3f4af1ca73f9924e9f34740c7d1452e22a7a 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -23,6 +23,7 @@ Patch0:               %{name}-shareware.patch
 Patch1:                %{name}-no_libnsl.patch
 Patch2:                %{name}-fix-keys.patch
 Patch3:                %{name}-etc_dir.patch
+Patch4:                %{name}-nolibtooltest.patch
 URL:           http://avifile.sourceforge.net/
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: XFree86-devel
@@ -34,7 +35,7 @@ BuildRequires:        automake
 BuildRequires: lame-libs-devel
 BuildRequires: libjpeg-devel
 BuildRequires: libogg-devel
-BuildRequires: libtool >= 0:1.4.2-9
+BuildRequires: libtool >= 1:1.4.3
 BuildRequires: libvorbis-devel >= 1:1.0
 %{?_with_nas:BuildRequires:    nas-devel}
 %{?!_without_qt:BuildRequires: qt-devel >= 2.0.0}
@@ -301,6 +302,7 @@ Sterownik VIDIX dla kart graficznych Permedia.
 %patch1 -p0
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 %{__autoconf}