-%define version_tools 0.6.1
+%define version_tools 0.7.0
Summary: SCUMM graphic adventure game interpreter
Summary(pl): Interpreter przygodówek opartych na SCUMM
Name: scummvm
-Version: 0.6.1
+Version: 0.7.1
Release: 1
License: GPL
Group: X11/Applications/Games
-Source0: http://dl.sourceforge.net/%{name}/%{name}-%{version}-src.tar.bz2
-# Source0-md5: 392bf788bb367258e5c34f77eced954d
-Source1: http://dl.sourceforge.net/%{name}/%{name}-tools-%{version_tools}-src.tar.bz2
-# Source1-md5: b2ba0801fbd85a568af1c5af14fd18ac
+Source0: http://dl.sourceforge.net/scummvm/%{name}-%{version}.tar.bz2
+# Source0-md5: a935499011c59441fcce8322ea1c4f1d
+Source1: http://dl.sourceforge.net/scummvm/%{name}-tools-%{version_tools}.tar.bz2
+# Source1-md5: eeebbd4e309a8564dd911d5c26fed2f0
Source2: %{name}.desktop
Source3: %{name}.png
+Patch0: %{name}-asm.patch
URL: http://scummvm.sourceforge.net/
+BuildRequires: SDL-devel >= 1.2.2
BuildRequires: libmad-devel
BuildRequires: libvorbis-devel
BuildRequires: mpeg2dec-devel
-BuildRequires: SDL-devel >= 1.2.2
+%ifarch %{ix86}
+BuildRequires: nasm
+%endif
+BuildRequires: sed >= 4.0
BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%prep
%setup -q -a 1
+%patch0 -p1
+
+sed -i -e 's:(name "/lib" name ".so"):("%{_libdir}/lib" name ".so"):' base/plugins.cpp
%build
./configure \
- --disable-debug
+ --disable-debug \
+%ifnarch %{ix86}
+ --disable-nasm \
+%endif
+ --enable-kyra \
+ --enable-plugins
%{__make} \
CXX="%{__cxx}" \
- CFLAGS="%{rpmcflags}" \
+ CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES -fpic" \
LDFLAGS="%{rpmldflags}"
-cd %{name}-%{version_tools}-tools
+cd %{name}-tools-%{version_tools}
%{__make} \
CC="%{__cc}" \
CFLAGS="%{rpmcflags}" \
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man6,%{_pixmapsdir},%{_desktopdir}}
+install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man6,%{_pixmapsdir},%{_desktopdir},%{_libdir}}
install scummvm $RPM_BUILD_ROOT%{_bindir}
install scummvm.6 $RPM_BUILD_ROOT%{_mandir}/man6
-cd %{name}-%{version_tools}-tools
-install {rescumm,loom_tg16_extract,mm_nes_extract} $RPM_BUILD_ROOT%{_bindir}
-install {queenrebuild,simon2mp3,compress_san} $RPM_BUILD_ROOT%{_bindir}
-install {descumm,desword2} $RPM_BUILD_ROOT%{_bindir}
-install {simon1decr,convbdf} $RPM_BUILD_ROOT%{_bindir}
-install extract $RPM_BUILD_ROOT%{_bindir}/extract-scummvm
+for i in kyra queen scumm sky sword{1,2} simon
+do
+ install $i/lib$i.so $RPM_BUILD_ROOT%{_libdir}
+done
+
+cd %{name}-tools-%{version_tools}
+install compress_san $RPM_BUILD_ROOT%{_bindir}
+install convbdf $RPM_BUILD_ROOT%{_bindir}
+install dekyra $RPM_BUILD_ROOT%{_bindir}
+install descumm $RPM_BUILD_ROOT%{_bindir}
+install desword2 $RPM_BUILD_ROOT%{_bindir}
+install extract $RPM_BUILD_ROOT%{_bindir}/extract-scummvm
+install kyra_unpak $RPM_BUILD_ROOT%{_bindir}
+install loom_tg16_extract $RPM_BUILD_ROOT%{_bindir}
+install mm_nes_extract $RPM_BUILD_ROOT%{_bindir}
+install queenrebuild $RPM_BUILD_ROOT%{_bindir}
+install rescumm $RPM_BUILD_ROOT%{_bindir}
+install saga2mp3 $RPM_BUILD_ROOT%{_bindir}
+install simon1decr $RPM_BUILD_ROOT%{_bindir}
+install simon2mp3 $RPM_BUILD_ROOT%{_bindir}
+install sword1mp3 $RPM_BUILD_ROOT%{_bindir}
+install sword2mp3 $RPM_BUILD_ROOT%{_bindir}
cd -
install %{SOURCE2} $RPM_BUILD_ROOT%{_desktopdir}
%defattr(644,root,root,755)
%doc NEWS README TODO
%attr(755,root,root) %{_bindir}/scummvm
+%attr(755,root,root) %{_libdir}/*
%{_mandir}/man6/*
%{_pixmapsdir}/*
%{_desktopdir}/*
%files tools
%defattr(644,root,root,755)
-%doc %{name}-%{version_tools}-tools/README
+%doc %{name}-tools-%{version_tools}/README
%attr(755,root,root) %{_bindir}/*
%exclude %{_bindir}/scummvm