- do not list %{_desktopdir}/* -- dangerous, could list directories unexpectedly

[packages/54321.git] / 54321.spec

diff --git a/54321.spec b/54321.spec
index 817131e0d6343af8753c8bc70080e2df9e608aa9..50c7a334abe93a914dea52707b0782d20e75991f 100644 (file)
--- a/54321.spec
+++ b/54321.spec
@@ -1,22 +1,22 @@
-Summary:       Preety puzzle games for one player.
-Summary(pl):   £adne uk³adanki dla jednego gracza.
+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:       4
 License:       GPL
 Group:         X11/Applications/Games
-Source0:       http://nklein.com/products/54321/1.0.2001.11.16/%{name}.tgz
+Source0:       http://nklein.com/products/54321/%{version}/%{name}.tgz
+# Source0-md5: 20b2ad52ef45742c1a65911b225b6ddc
 Source1:       %{name}.desktop
-Source2:       %{name}-exec
 Patch0:                %{name}-sdl_include_dir_fix.patch
+Patch1:                %{name}-linking.patch
+Patch2:                %{name}-SDL_main.patch
 URL:           http://www.nklein.com/products/54321/
 BuildRequires: SDL-devel
 BuildRequires: SDL_image-devel
 Requires:      SDL >= 1.2.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define         _prefix         /usr/X11R6
-
 %description
 54321 is five games in four-, three-, or two-dimensions for one
 player. 54321 takes five classic two-dimensional puzzle games and
@@ -30,34 +30,41 @@ gracza. Gry bazuj
 %prep
 %setup -q -n 54321
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %build
-%{__make} -f GNUmakefile CXXFLAGS="%{rpmcflags} -DNDEBUG=1" CC="%{__cc}" CXX="%{__cxx}"
+%{__make} -f GNUmakefile \
+       CC="%{__cc}" \
+       CXX="%{__cxx}" \
+       LDFLAGS="%{rpmldflags}" \
+       CXXFLAGS="%{rpmcflags} -I/usr/include/SDL -DNDEBUG=1" \
+       STRIP="echo"
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT $RPM_BUILD_ROOT%{_applnkdir}/Games \
-$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%{_applnkdir}/Games
-#gzip -9nf README
+install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-#%doc *.gz
-%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/*
-%{_applnkdir}/Games/*
+%{_datadir}/%{name}/data
+%{_desktopdir}/*.desktop