- fixes compilation errors with gcc 3.2 (stolen from MDK)

[packages/avifile.git] / avifile.spec

diff --git a/avifile.spec b/avifile.spec
index 008375c276d247ec25112b6c6c292603de31e339..5e3be195349721435e36bb2b707f07a369582854 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -11,14 +11,17 @@ Summary(pl):        Biblioteka do odtwarzania plik
 Summary(pt_BR):        Biblioteca para reproduzir formatos de áudio e vídeo usando binários win32
 Name:          avifile
 Version:       0.7.16
-Release:       0.%{_snap}.1
-Epoch:         4
+Release:       0.%{_snap}.3%{?_with_divx4:+divx4}
+Epoch:         3
 License:       GPL
 Group:         X11/Libraries
 Source0:       http://avifile.sourceforge.net/%{name}-%{version}-%{_snap}.tgz
 Source1:       %{name}.desktop
 Patch0:                %{name}-shareware.patch
 Patch1:                %{name}-no_libnsl.patch
+Patch2:                %{name}-vidix.patch
+Patch3:                %{name}-configure.patch
+Patch4:                %{name}-compilation.patch
 URL:           http://avifile.sourceforge.net/
 BuildRequires: SDL-devel >= 1.2.0
 BuildRequires: XFree86-devel
@@ -214,12 +217,15 @@ Dekoder i koder XVID.
 %setup -q -n avifile0.7-%{version}
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p0
 
 %build
 rm -f missing aclocal.m4
 %{__libtoolize}
 %{__aclocal}
-autoheader
+%{__autoheader}
 %{__autoconf}
 %{__automake}
 
@@ -232,8 +238,10 @@ cd libmmxnow
 cd ..
 
 # This is The WRONG Way (tm)
+%if %{!?_without_qt:1}%{?_without_qt:0}
 GEN_MOC="`grep -Rl '^ *Q_OBJECT$' *`"
 for f in $GEN_MOC; do moc -o "${f%.[!.]*}.moc" "$f"; done
+%endif
 
 %configure \
        CPPFLAGS="-I/usr/include/divx" AS="%{__cc}" \
@@ -245,12 +253,9 @@ for f in $GEN_MOC; do moc -o "${f%.[!.]*}.moc" "$f"; done
        --enable-ffmpeg \
        --enable-ffmpeg-a52 \
        %{?_with_divx4:--enable-divx4} \
-%ifarch i586 i686 athlon
-       --enable-x86opt \
-%else
        --disable-x86opt \
-%endif
-       %{?_without_qt:--without-qt}
+       %{?_without_qt:--without-qt} \
+       %{?_without_qt:--disable-samples}
 
 touch lib/dummy.cpp
 %{__make}
@@ -304,6 +309,7 @@ rm -rf $RPM_BUILD_ROOT
 %files aviplay
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/aviplay
+%{_mandir}/man1/aviplay.1*
 %{_datadir}/%{name}*
 %{_applnkdir}/Multimedia/*
 %{_pixmapsdir}/*
@@ -348,7 +354,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/avifile*/mp3lamebin_audioenc.so*
 %attr(755,root,root) %{_libdir}/avifile*/mp3lamebin_audioenc.la
 
-%ifarch %{ix86} ppc sparc sparc64 sparcv9
+%ifarch %{ix86} ppc
 %files xvid
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/avifile*/xvid.so*