From f3368dba294b0183bdb83bf52f629851f58b0c3b Mon Sep 17 00:00:00 2001 From: Jason Tibbitts Date: Wed, 17 May 2017 14:14:03 -0500 Subject: [PATCH] Additional cleanups. This fixes the "file listed twice" errors. I tested parallel make as required and documented that it doesn't work. Several rpmlint complaints remain; the missing-call-to-setgroups-before-setuid errors should definitely be investigated. But perhaps the newer version will be better. --- nethack.spec | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/nethack.spec b/nethack.spec index f59854b..83cb61d 100644 --- a/nethack.spec +++ b/nethack.spec @@ -86,6 +86,9 @@ sed -i -e "s:-L/usr/X11R6/lib:-L/usr/X11R6/%{_lib}:" \ %build +# 3.4.3 doesn't support parallel make; building with -j fails reliably for me. +# Perhaps later vesions will be better. +#make %%{?_smp_mflags} all make all @@ -133,19 +136,25 @@ fi if [ $1 -eq 0 ] ; then rm /etc/X11/fontpath.d/nethack rm %{_fontdir}/fonts.dir -fi; +fi %files -%doc doc/*.txt README dat/license dat/history +%license dat/license +%doc doc/*.txt README dat/history %doc dat/opthelp dat/wizhelp %{_mandir}/man6/* %{_datadir}/pixmaps/nethack.xpm %{_datadir}/applications/nethack.desktop +%dir %{nhgamedir} +%{nhgamedir}/NetHack.ad +%{nhgamedir}/license %{nhgamedir}/nhdat +%{nhgamedir}/pet_mark.xbm +%{nhgamedir}/rip.xpm +%{nhgamedir}/x11tiles %{_bindir}/nethack %{_bindir}/nethack-recover -%{nhgamedir} %defattr(0664,root,games) %config(noreplace) %{nhdatadir}/record %config(noreplace) %{nhdatadir}/perm