- changed %%{!?debug:...}%%{?debug...} to %%{?debug:...}%%{!?debug...}

[packages/avifile.git] / avifile.spec

diff --git a/avifile.spec b/avifile.spec
index b260eb337323a2c884df5f4383c6409bc65ae671..4b40b5927cb5e41a2ecc4cc01cce20629abe313e 100644 (file)
--- a/avifile.spec
+++ b/avifile.spec
@@ -1,24 +1,23 @@
 Summary:       Library and sample program for playing AVI files
 Summary(pl):   Biblioteka i przyk³adowy program do odtwarzania plików AVI
 Name:          avifile
-Version:       0.50
+Version:       0.52.1
 Release:       1
 License:       GPL
 Group:         X11/Applications/Multimedia
 Group(de):     X11/Applikationen/Multimedia
 Group(pl):     X11/Aplikacje/Multimedia
 Source0:       http://divx.euro.ru/%{name}-%{version}.tar.gz
-Patch0:                %{name}-DESTDIR.patch
-Patch1:                %{name}-old_ver_conflict.patch
-Patch2:                http://www.emulinks.de/divx/%{name}-%{version}.bitrate.patch
-# Note:                using non-standard optimizations generated non-working binary.
-#Patch2:       %{name}-OPT_FLAGS.patch
+Patch0:                http://www.emulinks.de/divx/%{name}-0.52.bitrate.patch
+Patch1:                http://www.emulinks.de/divx/%{name}-0.50.shareware.patch
+Patch2:                %{name}-DESTDIR.patch
 Requires:      avi-codecs
 BuildRequires: unzip
 BuildRequires: libstdc++-devel
 BuildRequires: xmps-devel
 BuildRequires: qt-devel
-BuildRequires: SDL-devel
+BuildRequires: SDL-devel >= 1.1.3
+BuildRequires: XFree86-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _prefix         /usr/X11R6
@@ -30,7 +29,7 @@ codecs and parts of Wine (http://www.winehq.com) code to load them.
 
 %description -l pl
 Biblioteka i przyk³adowy program do odtwarzania plików AVI.
-Wykorzystuje dekompresory dla Windows oraz fragmenty kody Wine
+Wykorzystuje dekompresory dla Windows oraz fragmenty kodu Wine
 (http://www.winehq.com) aby je za³adowaæ.
 
 %package devel
@@ -48,21 +47,29 @@ Pliki nag
 libaviplay.
 
 %prep
-%setup -q
+%setup -q -n %{name}-0.52
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-find . -exec touch {} \;
+cp configure.in configure.in.old
+sed -e "s#-march=i586##g" configure.in.old > configure.in
 
 %build
-%configure
-
+aclocal
+libtoolize --copy --force
+automake -a -c
+autoconf
+CD_OPT="%{?debug:-O -g}%{!?debug:$RPM_OPT_FLAGS}"; export CD_OPT
+%configure \
+       --with-qt-includes=%{_includedir}/qt \
+       --enable-release
+
+touch lib/dummy.cpp
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d "$RPM_BUILD_ROOT"{%{_bindir},%{_libdir},/usr/lib/win32}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_libdir},/usr/lib/win32}
 
 %{__make} install \
        DESTDIR="$RPM_BUILD_ROOT"
@@ -78,10 +85,14 @@ rm -rf $RPM_BUILD_ROOT
 %files
 %defattr(644,root,root,755)
 %doc *gz
-%attr(755,root,root) %{_bindir}/*
-%attr(755,root,root) %{_libdir}/*
+%attr(755,root,root) %{_bindir}/aviplay
+%attr(755,root,root) %{_bindir}/[bkq]*
+%attr(755,root,root) %{_libdir}/lib*.so.*.*
 %{_datadir}/%{name}
 
 %files devel
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/avifile-config
+%attr(755,root,root) %{_libdir}/lib*.la
+%{_libdir}/lib*.so
 %{_includedir}/%name