- removed dup from files

[packages/54321.git] / 54321.spec

diff --git a/54321.spec b/54321.spec
index d8811f5c7f73acd8cea70a8436c4b52e77690afb..383f73c5cfce935cf977b76a2cbedcb6d6698e71 100644 (file)
--- a/54321.spec
+++ b/54321.spec
@@ -2,7 +2,7 @@ Summary:        Preety puzzle games for one player
 Summary(pl):   £adne uk³adanki dla jednego gracza
 Name:          54321
 Version:       1.0.2001.11.16
-Release:       1
+Release:       2
 License:       GPL
 Group:         X11/Applications/Games
 Source0:       http://nklein.com/products/54321/1.0.2001.11.16/%{name}.tgz
@@ -16,7 +16,6 @@ BuildRequires:        SDL_image-devel
 Requires:      SDL >= 1.2.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-
 %description
 54321 is five games in four-, three-, or two-dimensions for one
 player. 54321 takes five classic two-dimensional puzzle games and
@@ -32,16 +31,22 @@ gracza. Gry bazuj
 %patch0 -p1
 
 %build
-%{__make} -f GNUmakefile CXXFLAGS="%{rpmcflags} -I /usr/include/SDL -DNDEBUG=1" CC="%{__cc}" CXX="%{__cxx}"
+%{__make} -f GNUmakefile \
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       CXXFLAGS="%{rpmcflags} -I/usr/include/SDL -DNDEBUG=1"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_desktopdir} \
-$RPM_BUILD_ROOT{%{_bindir},%{_datadir}/54321}
+install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_bindir},%{_datadir}/54321/bin/Linux,%{_libdir}/54321}
 
-cp -r Release/* $RPM_BUILD_ROOT%{_datadir}/54321
-install %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}
-mv $RPM_BUILD_ROOT%{_bindir}/54321-exec $RPM_BUILD_ROOT%{_bindir}/54321
+cp -r Release/data $RPM_BUILD_ROOT%{_datadir}/54321
+# hack to preserve %{_datadir} arch-independent
+install Release/bin/Linux/54321 $RPM_BUILD_ROOT%{_libdir}/54321
+cat > $RPM_BUILD_ROOT%{_bindir}/54321 <<EOF
+#!/bin/sh
+cd /usr/share/54321/bin/Linux && exec %{_libdir}/54321/54321 \$*
+EOF
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
@@ -50,13 +55,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-#%doc README
-%dir %{_datadir}/%{name}/
-%dir %{_datadir}/%{name}/data
+%doc README
+%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_libdir}/%{name}
+%dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/bin
 %dir %{_datadir}/%{name}/bin/Linux
-
-%attr(755,root,root) %{_bindir}/*
-%{_datadir}/%{name}/data/*
-%attr(755,root,root) %{_datadir}/%{name}/bin/Linux/*
+%{_datadir}/%{name}/data
 %{_desktopdir}/*