SPECS: scummvm.spec - finish update to 0.12.0

[adamg]

Author: adamg                        Date: Fri Dec 26 12:43:43 2008 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- finish update to 0.12.0

---- Files affected:
SPECS:
   scummvm.spec (1.51 -> 1.52) 

---- Diffs:

================================================================
Index: SPECS/scummvm.spec
diff -u SPECS/scummvm.spec:1.51 SPECS/scummvm.spec:1.52
--- SPECS/scummvm.spec:1.51	Fri Dec 26 02:52:48 2008
+++ SPECS/scummvm.spec	Fri Dec 26 13:43:37 2008
@@ -12,6 +12,7 @@
 Source1:	http://dl.sourceforge.net/scummvm/%{name}-tools-%{version_tools}.tar.bz2
 # Source1-md5:	af927a7cb59952ed869628250a916ab1
 Source2:	%{name}.desktop
+Patch0:		%{name}-wx-config.patch
 URL:		http://scummvm.org/
 BuildRequires:	SDL-devel >= 1.2.2
 BuildRequires:	wxWidgets-devel
@@ -302,6 +303,7 @@
 
 %prep
 %setup -q -a 1
+%patch0 -p1
 
 sed -i -e 's:"plugins/":"%{_libdir}/scummvm/":' backends/plugins/posix/posix-provider.cpp
 sed -i -e 's:"plugins/":"%{_libdir}/scummvm/":' backends/plugins/sdl/sdl-provider.cpp
@@ -314,18 +316,19 @@
 	--enable-cruise \
 	--enable-drascula \
 	--enable-igor \
-	--enable-plugins
+	--enable-plugins \
+	--default-dynamic
 
 %{__make} \
 	CXX="%{__cxx}" \
-	CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES -fpic $(wx-gtk2-unicode-config --cflags)" \
+	CXXFLAGS="%{rpmcflags} -DDYNAMIC_MODULES -fpic $(wx-gtk2-unicode-config --cppflags)" \
 	LDFLAGS="%{rpmldflags}"
 
 cd scummvm-tools-%{version_tools}
 %{__make} \
-	CC="%{__cc}" \
-	CFLAGS="%{rpmcflags} -DUNIX $(wx-gtk2-unicode-config --cflags)" \
-	LDFLAGS="%{rpmldflags}"
+	CXX="%{__cxx}" \
+	CXXFLAGS="%{rpmcflags} -DUNIX $(wx-gtk2-unicode-config --cppflags)" \
+	LDFLAGS="%{rpmldflags} $(wx-gtk2-unicode-config --libs)"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -466,8 +469,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.52  2008/12/26 12:43:37  adamg
+- finish update to 0.12.0
+
 Revision 1.51  2008/12/26 01:52:48  adamg
-- updated to 1.3.2
+- updated to 0.12.0
 
 Revision 1.50  2008-04-19 16:49:33  zagrodzki
 - updated to 0.11.1
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/SPECS/scummvm.spec?r1=1.51&r2=1.52&f=u