- added qt patch, use qt-mt; simplified install, release 2

[packages/cuyo.git] / cuyo.spec

diff --git a/cuyo.spec b/cuyo.spec
index f2359bd9b49eeda1a0ba77c77233ccc69394280d..dd2c111779b837412b741a4f146d31ee30a67e52 100644 (file)
--- a/cuyo.spec
+++ b/cuyo.spec
@@ -1,14 +1,14 @@
 Summary:       Cuyo - a Tetris clone
 Summary(pl):   Cuyo - klon Tetrisa
 Name:          cuyo
-Version:       1.7.0
-Release:       1
+Version:       1.8.5
+Release:       2
 License:       GPL
 Group:         X11/Applications/Games
-Source0:       http://freesoftware.fsf.org/download/%{name}/%{name}-%{version}.tar.gz
-# Source0-md5: e87f7a31df451fd5a674124b656e91fe
+Source0:       http://freesoftware.fsf.org/download/cuyo/%{name}-%{version}.tar.gz
+# Source0-md5: 9c250217ab90baeb993a238b9b98f63f
 Patch0:                %{name}-make.patch
-Patch1:                %{name}-no_pedantic.patch
+Patch1:                %{name}-qt.patch
 URL:           http://www.karimmi.de/cuyo/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -27,27 +27,26 @@ Cuyo to ciekawy klon Tetrisa.
 %patch1 -p1
 
 %build
-rm -f missing
 %{__aclocal} -I .
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-%configure
-for i in src/*.moc.cpp; do
-       rm -f $i;
-       moc ${i%.moc.cpp}.h > $i
+%configure \
+       QTDIR=%{_prefix}
+for i in src/{cuyo,prefs,punktefeld,spielfeld,startatdlg,tastenbtn,sound}.h; do
+       moc $i > ${i%.h}.moc.cpp
 done
-%{__make}
+%{__make} \
+       CPPFLAGS=-I/usr/include/qt \
+       %{!?debug:CXXDBGFLAGS="-DQT_NO_DEBUG -DQT_NO_CHECK %{rpmcflags}"} \
+       %{?debug:CXXDBGFLAGS="%{debugcflags}"}
 
 %install
-#Could somebody help me to force automake using DESTDIR? //pascalek
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_datadir}/%{name}/pics,%{_mandir}/man6}
 
-cp src/%{name} $RPM_BUILD_ROOT%{_bindir}
-cp data/*.ld $RPM_BUILD_ROOT%{_datadir}/%{name}
-cp data/pics/* $RPM_BUILD_ROOT%{_datadir}/%{name}/pics
-cp docs/%{name}.6 $RPM_BUILD_ROOT%{_mandir}/man6
+%{__make} install \
+       DESTDIR=$RPM_BUILD_ROOT \
+       gamesdir=%{_bindir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT