rpms/nethack/devel nethack-3.4.3-makefile.patch, 1.1, 1.2 nethack.spec, 1.1, 1.2

[Luke Macken (lmacken)]

Author: lmacken

Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28798

Modified Files:
	nethack-3.4.3-makefile.patch nethack.spec 
Log Message:
- Fixed various issues mentioned in Bug #165361


nethack-3.4.3-makefile.patch:

Index: nethack-3.4.3-makefile.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack-3.4.3-makefile.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack-3.4.3-makefile.patch	19 Jul 2005 17:53:54 -0000	1.1
+++ nethack-3.4.3-makefile.patch	16 Aug 2005 17:08:58 -0000	1.2
@@ -82,3 +82,17 @@
   
  # these are the names of the output files from YACC/LEX. Under MS-DOS
  # and similar systems, they may differ
+--- sys/unix/Makefile.doc.orig	2005-08-14 00:07:23.000000000 -0400
++++ sys/unix/Makefile.doc	2005-08-14 00:07:31.000000000 -0400
+@@ -59,10 +59,7 @@
+ 
+ manpages:
+ 	-$(GAMEMANCREATE) $(MANDIR)/$(GAME).$(MANEXT)
+-	-$(LEVMANCREATE) $(MANDIR)/lev_comp.$(MANEXT)
+-	-$(DGNMANCREATE) $(MANDIR)/dgn_comp.$(MANEXT)
+-	-$(RCVRMANCREATE) $(MANDIR)/recover.$(MANEXT)
+-	-$(DLBMANCREATE) $(MANDIR)/dlb.$(MANEXT)
++	-$(RCVRMANCREATE) $(MANDIR)/nethack-recover.$(MANEXT)
+ 
+ # manual creation for distribution
+ DISTRIB = Guidebook.txt nethack.txt lev_comp.txt dgn_comp.txt recover.txt dlb.txt


Index: nethack.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/nethack.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- nethack.spec	19 Jul 2005 17:53:54 -0000	1.1
+++ nethack.spec	16 Aug 2005 17:08:58 -0000	1.2
@@ -1,16 +1,16 @@
-%define nhgamedir /usr/games/nethack
+%define nhgamedir /usr/games/nethack-3.4.3
 %define nhdatadir /var/games/nethack
 
 Name:           nethack
 Version:        3.4.3
-Release:        1
-Summary:        A rouge-like single player dungeon exploration game
+Release:        1%{?dist}
+Summary:        A rogue-like single player dungeon exploration game
 
 Group:          Amusements/Games
 License:        NetHack General Public License
 URL:            http://nethack.org
 Source0:        http://dl.sf.net/%{name}/%{name}-343-src.tgz
-Source2:        %{name}.desktop
+Source1:        %{name}.desktop
 Patch0:         %{name}-%{version}-makefile.patch
 Patch1:         %{name}-%{version}-config.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -63,9 +63,9 @@
         CHOWN=/bin/true \
         CHGRP=/bin/true
 
+rm $RPM_BUILD_ROOT%{nhgamedir}/license
 rm -rf $RPM_BUILD_ROOT%{nhgamedir}/save
 mv $RPM_BUILD_ROOT%{nhgamedir}/recover $RPM_BUILD_ROOT%{_bindir}/nethack-recover
-chmod +x $RPM_BUILD_ROOT%{nhgamedir}/nethack
 
 install -d -m 0755 $RPM_BUILD_ROOT%{_mandir}/man6
 make -C doc MANDIR=$RPM_BUILD_ROOT%{_mandir}/man6 manpages
@@ -79,7 +79,7 @@
         --add-category X-Fedora \
         --add-category Application \
         --add-category Game \
-        %{SOURCE2}
+        %{SOURCE1}
 
 
 %clean
@@ -93,7 +93,6 @@
 %{_mandir}/man6/*
 %{_datadir}/pixmaps/nethack.xpm
 %{_datadir}/applications/fedora-nethack.desktop
-%{nhgamedir}/license
 %{nhgamedir}/nhdat
 %{_bindir}/nethack
 %{_bindir}/nethack-recover