SPECS (AC-branch): scummvm.spec - added flac-1.1.3 patch - hopeful...

hawk hawk at pld-linux.org
Mon Mar 12 17:11:46 CET 2007


Author: hawk                         Date: Mon Mar 12 16:11:46 2007 GMT
Module: SPECS                         Tag: AC-branch
---- Log message:
- added flac-1.1.3 patch
- hopefully fixed sparc (it sitinguish between -fpic and -fPIC)
- release 2

---- Files affected:
SPECS:
   scummvm.spec (1.43 -> 1.43.2.1) 

---- Diffs:

================================================================
Index: SPECS/scummvm.spec
diff -u SPECS/scummvm.spec:1.43 SPECS/scummvm.spec:1.43.2.1
--- SPECS/scummvm.spec:1.43	Tue Jan  2 01:03:27 2007
+++ SPECS/scummvm.spec	Mon Mar 12 17:11:41 2007
@@ -8,7 +8,7 @@
 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
@@ -17,6 +17,7 @@
 # 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}
@@ -32,8 +33,6 @@
 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
@@ -80,6 +79,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 
 sed -i -e 's:"plugins/":"%{_libdir}/scummvm/":' base/plugins.cpp
 
@@ -95,7 +95,11 @@
 
 %{__make} \
 	CXX="%{__cxx}" \
+%ifnarch sparc sparc64
+	CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES" \
+%else
 	CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES -fpic" \
+%endif
 	LDFLAGS="%{rpmldflags}"
 
 cd tools-%{version_tools}
@@ -163,6 +167,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.43.2.1  2007/03/12 16:11:41  hawk
+- added flac-1.1.3 patch
+- hopefully fixed sparc (it sitinguish between -fpic and -fPIC)
+- release 2
+
 Revision 1.43  2007/01/02 00:03:27  arekm
 - up to 0.9.1
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/scummvm.spec?r1=1.43&r2=1.43.2.1&f=u



More information about the pld-cvs-commit mailing list