- force using shared qt-mt

[packages/cuyo.git] / cuyo.spec

diff --git a/cuyo.spec b/cuyo.spec
index 06926b3df42e135bafb8bddc0dec864f484ec054..ed1f84a3a46abaa3f1cb0b3759b1469b9964df92 100644 (file)
--- a/cuyo.spec
+++ b/cuyo.spec
@@ -1,14 +1,13 @@
 Summary:       Cuyo - a Tetris clone
 Summary(pl):   Cuyo - klon Tetrisa
 Name:          cuyo
-Version:       1.8.2
+Version:       1.8.5
 Release:       1
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       http://freesoftware.fsf.org/download/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: f86a4bda57e0ab380880aad62188ecdb
+# Source0-md5: 9c250217ab90baeb993a238b9b98f63f
 Patch0:                %{name}-make.patch
-Patch1:                %{name}-no_pedantic.patch
 URL:           http://www.karimmi.de/cuyo/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -24,7 +23,6 @@ Cuyo to ciekawy klon Tetrisa.
 %prep
 %setup -q
 %patch0 -p1
-%patch1 -p1
 
 %build
 rm -f missing
@@ -32,11 +30,14 @@ rm -f missing
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-for i in src/{cuyo,prefs,punktefeld,spielfeld,startatdlg,tastenbtn}.h; do
+sed -i -e 's/include\/qglobal.h/include\/qt\/qglobal.h/' configure aclocal.m4 gwqt.m4
+%configure \
+       QTDIR=%{_prefix}
+for i in src/{cuyo,prefs,punktefeld,spielfeld,startatdlg,tastenbtn,sound}.h; do
        moc $i > ${i%.h}.moc.cpp
 done
 %{__make} \
+       CPPFLAGS=-I/usr/include/qt \
        %{!?debug:CXXDBGFLAGS="-DQT_NO_DEBUG -DQT_NO_CHECK %{rpmcflags}"} \
        %{?debug:CXXDBGFLAGS="%{debugcflags}"}