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

Changed files:
    cuyo.spec -> 1.14

diff --git a/cuyo.spec b/cuyo.spec
index ed1f84a3a46abaa3f1cb0b3759b1469b9964df92..dd2c111779b837412b741a4f146d31ee30a67e52 100644 (file)
--- a/cuyo.spec
+++ b/cuyo.spec
@@ -2,12 +2,13 @@ Summary:      Cuyo - a Tetris clone
 Summary(pl):   Cuyo - klon Tetrisa
 Name:          cuyo
 Version:       1.8.5
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications/Games
-Source0:       http://freesoftware.fsf.org/download/%{name}/%{name}-%{version}.tar.gz
+Source0:       http://freesoftware.fsf.org/download/cuyo/%{name}-%{version}.tar.gz
 # Source0-md5: 9c250217ab90baeb993a238b9b98f63f
 Patch0:                %{name}-make.patch
+Patch1:                %{name}-qt.patch
 URL:           http://www.karimmi.de/cuyo/
 BuildRequires: automake
 BuildRequires: autoconf
@@ -23,14 +24,13 @@ Cuyo to ciekawy klon Tetrisa.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
-rm -f missing
 %{__aclocal} -I .
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-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
@@ -42,14 +42,11 @@ done
        %{?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