From c844e5b98679a8537b9ee73dc8f385889d1d6d09 Mon Sep 17 00:00:00 2001 From: hawk Date: Mon, 12 Mar 2007 16:11:41 +0000 Subject: [PATCH] - added flac-1.1.3 patch - hopefully fixed sparc (it sitinguish between -fpic and -fPIC) - release 2 Changed files: scummvm.spec -> 1.43.2.1 --- scummvm.spec | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/scummvm.spec b/scummvm.spec index 7da0cf9..379c649 100644 --- a/scummvm.spec +++ b/scummvm.spec @@ -7,7 +7,7 @@ Summary: SCUMM graphic adventure game interpreter Summary(pl): Interpreter przygodówek opartych na SCUMM Name: scummvm Version: 0.9.1 -Release: 1 +Release: 2 License: GPL Group: X11/Applications/Games Source0: http://dl.sourceforge.net/scummvm/%{name}-%{version}.tar.bz2 @@ -16,6 +16,7 @@ Source1: http://dl.sourceforge.net/scummvm/%{name}-tools-%{version_tools}.tar.bz # Source1-md5: c8164fa1cca90b1c3bff1c8949d875a3 Source2: %{name}.desktop Source3: %{name}.png +Patch0: %{name}-flac.patch URL: http://scummvm.sourceforge.net/ BuildRequires: SDL-devel >= 1.2.2 %ifarch %{ix86} %{x8664} @@ -31,8 +32,6 @@ BuildRequires: sed >= 4.0 BuildRequires: zlib-devel BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) -%define specflags_sparc -fPIC - %description ScummVM is a collection of interpreters, capable of emulating several adventure game engines. ScummVM mainly supports games created using @@ -79,6 +78,7 @@ Zestaw narz %prep %setup -q -a 1 +%patch0 -p1 sed -i -e 's:"plugins/":"%{_libdir}/scummvm/":' base/plugins.cpp @@ -94,7 +94,11 @@ sed -i -e 's:"plugins/":"%{_libdir}/scummvm/":' base/plugins.cpp %{__make} \ CXX="%{__cxx}" \ +%ifnarch sparc sparc64 + CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES" \ +%else CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES -fpic" \ +%endif LDFLAGS="%{rpmldflags}" cd tools-%{version_tools} -- 2.44.0