X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=avifile.spec;h=b92ee794d2d5fcf5a1c854b6522e51cb48b841fa;hb=ba5718b9777c7269102554d9e4a7733fe2659991;hp=2dfea1892ae31001d6e712178bd471afa8ecce07;hpb=0140e402488ef8cf92c8c9e22a81de9048f08084;p=packages%2Favifile.git

diff --git a/avifile.spec b/avifile.spec
index 2dfea18..b92ee79 100644
--- a/avifile.spec
+++ b/avifile.spec
@@ -1,51 +1,69 @@
-# It's sick.
-%define		_snapver	20011220
-%define		_snapsubver	admin
-%define		_snap		%{_snapver}%{_snapsubver}
-%define		_ver	0.6
-%define		_subver	.0
+#
+# Conditional build:
+%bcond_without	qt	# don't build Qt-based utilities (incl. aviplay)
+%bcond_with	divx	# enables divx4linux support (proprietary, binary-only
+			# lib)  note: if disabled, divx is decoded by ffmpeg
+%bcond_with	nas	# enable NAS support
+#
 Summary:	Library for playing AVI files
 Summary(pl):	Biblioteka do odtwarzania plików AVI
+Summary(pt_BR):	Biblioteca para reproduzir formatos de áudio e vídeo usando binários win32
 Name:		avifile
-Version:	%{_ver}%{_subver}
-Release:	0.%{_snap}.3
+Version:	0.7.38
+Release:	7%{?with_divx:+divx}
 Epoch:		3
 License:	GPL
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-URL:		http://avifile.sourceforge.net/
-Source0:	http://avifile.sourceforge.net/%{name}-%{version}-%{_snap}.tgz
+Source0:	http://dl.sourceforge.net/%{name}/%{name}-0.7-%{version}.tar.gz
+# Source0-md5:	db90c4bc0a8a8182b1ec084feca86bbb
 Source1:	%{name}.desktop
 Patch0:		%{name}-shareware.patch
-Patch1:		%{name}-deplib.patch
-Patch2:		%{name}-ac3.patch
-Patch3:		%{name}-size_t.patch
-Patch4:		%{name}-amfix.patch
-BuildRequires:	XFree86-devel
+Patch1:		%{name}-fix-keys.patch
+Patch2:		%{name}-etc_dir.patch
+Patch3:		%{name}-aviplay_h.patch
+Patch4:		%{name}-am18.patch
+Patch5:		%{name}-no_aux_dir.patch
+Patch6:		%{name}-link_shared.patch
+Patch7:		%{name}-avifile_config_fix.patch
+Patch8:		%{name}-no_libnsl.patch
+Patch9:		%{name}-system-libmad.patch
+Patch10:	%{name}-ffmpeg-alpha.patch
+Patch11:	%{name}-opt.patch
+Patch12:	%{name}-ffmpeg-ppc.patch
+Patch13:	%{name}-freetype-includes.patch
+Patch14:	%{name}-linux2.6.patch
+Patch15:	%{name}-xvid1.patch
+Patch16:	%{name}-opts.patch
+Patch17:	%{name}-mp3.patch
+URL:		http://avifile.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.2.0
-BuildRequires:	ac3dec-devel >= 0.6.1
-BuildRequires:	libjpeg-devel
-BuildRequires:	unzip
-BuildRequires:	qt-devel
-BuildRequires:	divx4linux-devel
+BuildRequires:	XFree86-devel
+BuildRequires:	a52dec-libs-devel
+BuildRequires:	audiofile-devel
 BuildRequires:	autoconf
 BuildRequires:	automake
-BuildRequires:	libtool
-BuildRequires:	libogg-devel
-BuildRequires:	libvorbis-devel
+%{?with_divx:BuildRequires:	divx4linux-devel}
+BuildRequires:	faad2-devel
+%ifarch ppc
+# version with altivec support fixed
+BuildRequires:	gcc >= 5:3.3.2-3
+%endif
 BuildRequires:	lame-libs-devel
+BuildRequires:	libjpeg-devel
+BuildRequires:	libmad-devel
+BuildRequires:	libogg-devel
+BuildRequires:	libtool >= 1:1.4.3
+BuildRequires:	libvorbis-devel >= 1:1.0
+%{?with_nas:BuildRequires:	nas-devel}
+BuildRequires:	pkgconfig
+%{?with_qt:BuildRequires:	qt-devel >= 2.0.0}
+BuildRequires:	unzip
+BuildRequires:	xft-devel
+BuildRequires:	xvid-devel >= 1:1.0.0
 BuildConflicts:	wine-devel
+Obsoletes:	avifile-vidix-nvidia
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_prefix		/usr/X11R6
-%define		_mandir		%{_prefix}/man
-
 %description
 Avifile is a library that allow programs to read and write compressed
 AVI files (Indeo Video, DivX :-), etc.) under x86 Linux.
@@ -56,19 +74,21 @@ Avifile jest bibliotek
 skompresowanych plików AVI (Indeo Video, DivX :-), etc.) pod Linuksem.
 Do (de)kompresji u¿ywane s± pluginy (win32, FFMpeg, ...)
 
+%description -l pt_BR
+Avifile busca criar uma biblioteca usável de suporte a arquivos AVI e
+um conjunto básico de utilitários (para reprodução, captura e edição)
+para o Linux. Contém classes C++ para leitura e criação de AVIs e
+interfaces para compressores e descompresseores de áudio e vídeo.
+
 %package devel
 Summary:	Header file required to build programs using libavifile
 Summary(pl):	Pliki nag³ówkowe wymagane przez programy u¿ywaj±ce libavifile
+Summary(pt_BR):	Componentes para desenvolvimento com a avifile
 Group:		X11/Development/Libraries
-Group(de):	X11/Entwicklung/Libraries
-Group(es):	X11/Desarrollo/Bibliotecas
-Group(fr):	X11/Development/Librairies
-Group(pl):	X11/Programowanie/Biblioteki
-Group(pt_BR):	X11/Desenvolvimento/Bibliotecas
-Group(ru):	X11/òÁÚÒÁÂÏÔËÁ/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/òÏÚÒÏÂËÁ/â¦Â̦ÏÔÅËÉ
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	XFree86-devel
-Requires:	%{name} = %{version}
+Requires:	xft-devel
+Requires:	zlib-devel
 
 %description devel
 Header files required to build programs using libavifile.
@@ -77,13 +97,26 @@ Header files required to build programs using libavifile.
 Pliki nag³ówkowe niezbêdne do kompilacji programów korzystaj±cych z
 libavifile.
 
+%description devel -l pt_BR
+Componentes para desenvolvimento com a avifile.
+
+%package qt
+Summary:	Qt-based AVI utilities
+Summary(pl):	Oparte na bibliotece Qt narzêdzia do plików AVI
+Group:		X11/Applications/Multimedia
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description qt
+Qt-based AVI utilities.
+
+%description qt -l pl
+Oparte na bibliotece Qt narzêdzia do plików AVI.
+
 %package aviplay
 Summary:	Player for AVI/ASF/WMF files
 Summary(pl):	Odtwarzacz plików AVI/ASF/WMF
 Group:		X11/Applications/Multimedia
-Group(de):	X11/Applikationen/Multimedia
-Group(pl):	X11/Aplikacje/Multimedia
-Requires:	%{name} = %{version}
+Requires:	%{name}-qt = %{epoch}:%{version}-%{release}
 
 %description aviplay
 Sample player for AVI, ASF, WFM (with straming support) files.
@@ -96,9 +129,7 @@ odtwarzania z sieci.)
 Summary:	Sample programs using the avifile library
 Summary(pl):	Przyk³adowe programy u¿ywaj±ce biblioteki avifile
 Group:		X11/Applications/Multimedia
-Group(de):	X11/Applikationen/Multimedia
-Group(pl):	X11/Aplikacje/Multimedia
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description utils
 Qt-based AVI utilities with few other useful supporting tools for TV
@@ -115,33 +146,22 @@ s
 Summary:	Win32 audio/video plugin
 Summary(pl):	Plugin audio/video win32
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
-Requires:	w32codecs
-ExclusiveArch:	%{ix86}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	w32codec
 
 %description win32
 Plugin for using Win32 DLL libraries in avifile located in
-/usr/lib/win32
+/usr/lib/win32.
+
+%description win32 -l pl
+Plugin do u¿ywania w avifile zlokalizowanych w /usr/lib/win32
+bibliotek DLL Win32.
 
 %package ffmpeg
 Summary:	GPL MPEG4 codec
 Summary(pl):	Kodek MPEG4 na licencji GPL
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description ffmpeg
 ffmpeg is a hyper fast realtime audio/video encoder, a streaming
@@ -152,55 +172,46 @@ into several file formats based on DCT/motion compensation encoding.
 Sound is compressed in MPEG audio layer 2 or using an AC3 compatible
 stream.
 
-%package divx4
+%description ffmpeg -l pl
+ffmpeg jest hiperszybkim koderem audio/wideo czasu rzeczywistego,
+serwerem strumieni oraz standardowym konwerterem plików audio-wideo.
+
+Mo¿e pobieraæ ze standardowego Video4Linux ¼ród³o obrazu i konwertowaæ
+je do kilku formatów plików opartych na kodowaniu DCT/kompensacji
+ruchu. D¼wiêk jest kompresowany w MPEG audio layer 2 lub u¿ywaj±c
+kompatybilnego z AC3 strumienia.
+
+%package divx
 Summary:	Fast MPEG4 codec
 Summary(pl):	Szybki kodek MPEG4
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	divx4linux
-ExclusiveArch:	%{ix86}
+Obsoletes:	avifile-divx4
 
-%description divx4
+%description divx
 DivX MPEG-4 decoder and encoder.
 
-%description divx4 -l pl
+%description divx -l pl
 Dekoder i koder MPEG-4 DivX.
 
 %package vorbis
 Summary:	Vorbis audio plugin
-Summary(pl):	Plugin vorbis audio.
+Summary(pl):	Plugin vorbis audio
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description vorbis
 Plugin for decompression of Vorbis audio streams.
 
+%description vorbis -l pl
+Plugin do dekompresji strumieni audio Vorbis.
+
 %package mad
 Summary:	MAD - MPEG audio plugin
 Summary(pl):	MAD - plugin MPEG audio
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
 
 %description mad
 Plugin for decompression of MPEG-1 Layer I/II/III audio streams.
@@ -212,143 +223,315 @@ Plugin do dekompresji strumieni d
 Summary:	MP3 audio encoder plugin
 Summary(pl):	Plugin enkoduj±cy d¼wiêk w formacie MP3
 Group:		X11/Libraries
-Group(de):	X11/Libraries
-Group(es):	X11/Bibliotecas
-Group(fr):	X11/Librairies
-Group(pl):	X11/Biblioteki
-Group(pt_BR):	X11/Bibliotecas
-Group(ru):	X11/âÉÂÌÉÏÔÅËÉ
-Group(uk):	X11/â¦Â̦ÏÔÅËÉ
-Requires:	%{name} = %{version}
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+# this library is dlopened
+Requires:	libmp3lame.so.0
+Requires:	lame-libs
 
 %description lame_audioenc
 Plugin for mp3 encoding capability of avirecompress tool.
 
+%description lame_audioenc -l pl
+Plugin umo¿liwiaj±cy avirecompressowi kodowanie mp3.
+
+%package xvid
+Summary:	XVID codec
+Summary(pl):	Kodek XVID
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+Requires:	xvid
+
+%description xvid
+XVID decoder and encoder.
+
+%description xvid -l pl
+Dekoder i koder XVID.
+
+%package vidix-driver-fb
+Summary:	VIDIX driver for generic FrameBuffer
+Summary(pl):	Sterownik VIDIX dla zwyk³ego FrameBuffera
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-fb
+VIDIX driver for generic FrameBuffer.
+
+%description vidix-driver-fb -l pl
+Sterownik VIDIX dla zwyk³ego FrameBuffera.
+
+%package vidix-driver-mach64
+Summary:	VIDIX driver for ATI Mach64 video adapters
+Summary(pl):	Sterownik VIDIX dla kart graficznych ATI Mach64
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-mach64
+VIDIX driver for ATI Mach64 adapters.
+
+%description vidix-driver-mach64 -l pl
+Sterownik vidix dla kart graficznych ATI Mach64.
+
+%package vidix-driver-rage128
+Summary:	VIDIX driver for ATI Rage128 video adapters
+Summary(pl):	Sterownik VIDIX dla kart graficznych ATI Rage128
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-rage128
+VIDIX driver for ATI Rage128 video adapters.
+
+%description vidix-driver-rage128 -l pl
+Sterownik VIDIX dla kart graficznych ATI Rage128.
+
+%package vidix-driver-radeon
+Summary:	VIDIX driver for ATI Radeon video adapters
+Summary(pl):	Sterownik VIDIX dla kart graficznych ATI Radeon
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-radeon
+VIDIX driver for ATI Radeon video adapters.
+
+%description vidix-driver-radeon -l pl
+Sterownik VIDIX dla kart graficznych ATI Radeon.
+
+%package vidix-driver-mga
+Summary:	VIDIX driver for MGA (Matrox) video adapters
+Summary(pl):	Sterownik VIDIX dla kart graficznych MGA (Matrox)
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-mga
+VIDIX driver for MGA (Matrox) video adapters.
+
+%description vidix-driver-mga -l pl
+Sterownik VIDIX dla kart graficznych MGA (Matrox).
+
+%package vidix-driver-nvidia
+Summary:	VIDIX driver for NVidia video adapters
+Summary(pl):	Sterownik VIDIX dla kart graficznych NVidia
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-nvidia
+VIDIX driver for NVidia video adapters.
+
+%description vidix-driver-nvidia -l pl
+Sterownik VIDIX dla kart graficznych NVidia.
+
+%package vidix-driver-permedia
+Summary:	VIDIX driver for Permedia video adapters
+Summary(pl):	Sterownik VIDIX dla kart graficznych Permedia
+Group:		X11/Libraries
+Requires:	%{name} = %{epoch}:%{version}-%{release}
+
+%description vidix-driver-permedia
+VIDIX driver for Permedia video adapters.
+
+%description vidix-driver-permedia -l pl
+Sterownik VIDIX dla kart graficznych Permedia.
+
 %prep
-%setup -q -n avifile%{_ver}-%{_snapver}
+%setup -q -n %{name}-0.7-%{version}
 %patch0 -p1
-# was broken and need fixing; without this xmms and avi plugin is broken
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
+%patch6 -p1
+%patch7 -p1
+%patch8 -p1
+%patch9 -p1
+%patch10 -p1
+%patch11 -p1
+%patch12 -p1
+%patch13 -p1
+%patch14 -p1
+%patch15 -p1
+%patch16 -p1
+%patch17 -p1
+
+# unwanted hack
+rm -f m4/as.m4
+# original file contains only m4/*.m4; must exist because of AC_INIT parameter
+> acinclude.m4
 
 %build
-rm -f missing aclocal.m4
-libtoolize --copy --force
-aclocal
-autoconf
-autoheader
-automake -a -c --foreign
-
-cd plugins/libmad/libmad
-autoconf
-cd ../../..
-
-cd libmmxnow
-autoconf
-cd ..
-
-# This is The WRONG Way (tm)
-GEN_MOC="`grep -Rl '^ *Q_OBJECT$' *`"
-for f in $GEN_MOC; do moc -o "${f%.[!.]*}.moc" "$f"; done
-
-%configure CPPFLAGS="-I/usr/include/divx" AS="%{__cc}" \
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
+
+%configure \
+	CPPFLAGS="-I/usr/include/divx" \
 	--with-qt-includes=%{_includedir}/qt \
-	--with-libac3-path=%{_prefix} \
+	--with-qt-libraries=%{_libdir} \
+	--enable-a52 \
+	%{?with_divx:--enable-divx4} \
+	--enable-ffmpeg \
+	--enable-ffmpeg-a52 \
+	--enable-lamebin \
+	--disable-lame \
+	--enable-libmad \
 	--enable-release \
-	--enable-ffmpeg
+%ifarch %{ix86}
+%ifnarch i386 i486
+	--enable-x86opt \
+%endif
+%else
+	--disable-x86opt \
+%endif
+	%{!?with_qt:--without-qt} \
+	%{!?with_qt:--disable-samples}
 
 touch lib/dummy.cpp
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/usr/lib/win32,%{_pixmapsdir},%{_applnkdir}/Multimedia}
-
-# avoid relinking
-for f in plugins/*/lib*.la ; do
-	sed -e '/^relink_command/d' $f > $f.new
-	mv -f $f.new $f
-done
-	
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_includedir}/%{name},%{_libdir},/usr/lib/win32,%{_pixmapsdir},%{_desktopdir}}
+
 %{__make} install \
-	DESTDIR="$RPM_BUILD_ROOT"
+	DESTDIR=$RPM_BUILD_ROOT \
+	m4datadir="%{_aclocaldir}"
 
-cp -f include/fourcc.h $RPM_BUILD_ROOT/%{_includedir}/%{name}
+cp -f include/fourcc.h $RPM_BUILD_ROOT%{_includedir}/%{name}
 
-gzip -9nf README doc/{CREDITS,EXCEPTIONS,KNOWN_BUGS,LICENSING} \
-	doc/{README-DEVEL,TODO,VIDEO-PERFORMANCE,WARNINGS}
+mv -f $RPM_BUILD_ROOT%{_bindir}/kv4lsetup $RPM_BUILD_ROOT%{_bindir}/akv4lsetup
+mv -f $RPM_BUILD_ROOT%{_includedir}/%{name}-0.7/* $RPM_BUILD_ROOT%{_includedir}/%{name}
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_applnkdir}/Multimedia
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install bin/test.png $RPM_BUILD_ROOT%{_pixmapsdir}/avifile.png
 
+# avifile dlopens *.so
+rm -f $RPM_BUILD_ROOT%{_libdir}/avifile*/{,vidix/}*.la
+# API not exported
+rm -f $RPM_BUILD_ROOT%{_libdir}/libqavm*.{so,la}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post	-p /sbin/ldconfig
 %postun	-p /sbin/ldconfig
 
+%post	qt -p /sbin/ldconfig
+%postun	qt -p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
-%doc *.gz doc/{CREDITS,EXCEPTIONS,KNOWN_BUGS,LICENSING}.gz
-%doc doc/{TODO,VIDEO-PERFORMANCE,WARNINGS}.gz
-%attr(755,root,root) %{_libdir}/lib*.so.*.*
+%doc README doc/{CREDITS,EXCEPTIONS,KNOWN_BUGS,LICENSING}
+%doc doc/{README-DEVEL,TODO,VIDEO-PERFORMANCE,WARNINGS}
+%attr(755,root,root) %{_libdir}/libaviplay*.so.*.*
 %dir %{_libdir}/avifile*
-%attr(755,root,root) %{_libdir}/avifile*/lib*audiodec.so*
-%attr(755,root,root) %{_libdir}/avifile*/lib*audiodec.la
-%attr(755,root,root) %{_libdir}/avifile*/libac3pass.so*
-%attr(755,root,root) %{_libdir}/avifile*/libac3pass.la
-%attr(755,root,root) %{_libdir}/avifile*/libmjpeg.so*
-%attr(755,root,root) %{_libdir}/avifile*/libmjpeg.la
+%attr(755,root,root) %{_libdir}/avifile*/audiodec.so*
+%attr(755,root,root) %{_libdir}/avifile*/mpeg_audiodec.so*
+%attr(755,root,root) %{_libdir}/avifile*/ac3pass.so*
+%attr(755,root,root) %{_libdir}/avifile*/mjpeg.so*
+%ifarch %{ix86}
+%dir %{_libdir}/avifile*/vidix
+%endif
 
 %files devel
 %defattr(644,root,root,755)
 %doc doc/README-DEVEL*
 %attr(755,root,root) %{_bindir}/avifile-config
-%attr(755,root,root) %{_bindir}/mmxnow-config
-%attr(755,root,root) %{_libdir}/lib*.la
-%{_libdir}/lib*.so
+%attr(755,root,root) %{_libdir}/libaviplay*.so
+%{_libdir}/lib*.la
 %{_includedir}/%{name}
+%{_aclocaldir}/*.m4
+%{_pkgconfigdir}/%{name}.pc
+%{_mandir}/man1/avifile-config.1*
+
+%if %{with qt}
+%files qt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/avicap
+%attr(755,root,root) %{_bindir}/avirecompress
+%attr(755,root,root) %{_libdir}/libqavm*.so.*.*
+%{_mandir}/man1/avicap.1*
+%{_mandir}/man1/avirecompress.1*
 
 %files aviplay
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/aviplay
+%{_mandir}/man1/aviplay.1*
 %{_datadir}/%{name}*
-%{_applnkdir}/Multimedia/*
+%{_desktopdir}/*
 %{_pixmapsdir}/*
+%endif
 
 %files utils
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/avi[bcmrt]*
-%attr(755,root,root) %{_bindir}/kv4lsetup
-
+%attr(755,root,root) %{_bindir}/avibench
+%attr(755,root,root) %{_bindir}/avicat
+%attr(755,root,root) %{_bindir}/avimake
+%attr(755,root,root) %{_bindir}/avirec
+%attr(755,root,root) %{_bindir}/avitype
+%attr(755,root,root) %{_bindir}/akv4lsetup
+%{_mandir}/man1/avibench.1*
+%{_mandir}/man1/avicat.1*
+%{_mandir}/man1/avimake.1*
+%{_mandir}/man1/avirec.1*
+%{_mandir}/man1/avitype.1*
+%{_mandir}/man1/kv4lsetup.1*
+
+%ifarch %{ix86}
 %files win32
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/libwin32.so*
-%attr(755,root,root) %{_libdir}/avifile*/libwin32.la
+%attr(755,root,root) %{_libdir}/avifile*/win32.so*
+%endif
 
 %files ffmpeg
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/libffmpeg.so*
-%attr(755,root,root) %{_libdir}/avifile*/libffmpeg.la
+%attr(755,root,root) %{_libdir}/avifile*/ffmpeg.so*
 
-%files divx4
+%if %{with divx}
+%files divx
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/libdivx4.so*
-%attr(755,root,root) %{_libdir}/avifile*/libdivx4.la
+%attr(755,root,root) %{_libdir}/avifile*/divx*.so*
+%endif
 
 %files vorbis
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/libvorbis*.so*
-%attr(755,root,root) %{_libdir}/avifile*/libvorbis*.la
+%attr(755,root,root) %{_libdir}/avifile*/vorbis*.so*
 
 %files mad
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/libmad*.so*
-%attr(755,root,root) %{_libdir}/avifile*/libmad*.la
+%attr(755,root,root) %{_libdir}/avifile*/mad*.so*
 
 %files lame_audioenc
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/avifile*/libmp3lamebin_audioenc.so*
-%attr(755,root,root) %{_libdir}/avifile*/libmp3lamebin_audioenc.la
+%attr(755,root,root) %{_libdir}/avifile*/mp3lamebin_audioenc.so*
+#%attr(755,root,root) %{_libdir}/avifile*/mp3lame_audioenc.so*
+
+%files xvid
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/xvid.so*
+
+%ifarch %{ix86}
+%files vidix-driver-fb
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/vidix/libgenfb.so*
+
+%files vidix-driver-mach64
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/vidix/libmach64.so*
+
+%files vidix-driver-rage128
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/vidix/librage128.so*
+
+%files vidix-driver-radeon
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/vidix/libradeon.so*
+
+%files vidix-driver-mga
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/vidix/libmga*.so*
+
+%files vidix-driver-permedia
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/avifile*/vidix/libpm3.so*
+%endif