rpms/nethack/devel nethack-3.4.3-config.patch, NONE, 1.1 nethack-3.4.3-makefile.patch, NONE, 1.1 nethack.desktop, NONE, 1.1 nethack.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Luke Macken (lmacken)
fedora-extras-commits at redhat.com
Tue Jul 19 17:53:56 UTC 2005
Author: lmacken
Update of /cvs/extras/rpms/nethack/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12757/devel
Modified Files:
.cvsignore sources
Added Files:
nethack-3.4.3-config.patch nethack-3.4.3-makefile.patch
nethack.desktop nethack.spec
Log Message:
auto-import nethack-3.4.3-1 on branch devel from nethack-3.4.3-1.src.rpm
nethack-3.4.3-config.patch:
--- NEW FILE nethack-3.4.3-config.patch ---
--- include/config.h.orig 2003-12-07 18:39:13.000000000 -0500
+++ include/config.h 2005-06-25 20:21:41.000000000 -0400
@@ -143,10 +143,10 @@
#ifndef WIZARD /* allow for compile-time or Makefile changes */
# ifndef KR1ED
-# define WIZARD "wizard" /* the person allowed to use the -D option */
+# define WIZARD "games" /* the person allowed to use the -D option */
# else
# define WIZARD
-# define WIZARD_NAME "wizard"
+# define WIZARD_NAME "games"
# endif
#endif
@@ -169,8 +169,8 @@
#ifdef UNIX
/* path and file name extension for compression program */
-#define COMPRESS "/usr/bin/compress" /* Lempel-Ziv compression */
-#define COMPRESS_EXTENSION ".Z" /* compress's extension */
+#define COMPRESS "/usr/bin/bzip2" /* Lempel-Ziv compression */
+#define COMPRESS_EXTENSION ".bz2" /* compress's extension */
/* An example of one alternative you might want to use: */
/* #define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
/* #define COMPRESS_EXTENSION ".gz" */ /* normal gzip extension */
@@ -185,7 +185,7 @@
* a tar-like file, thus making a neater installation. See *conf.h
* for detailed configuration.
*/
-/* #define DLB */ /* not supported on all platforms */
+#define DLB /* not supported on all platforms */
/*
* Defining INSURANCE slows down level changes, but allows games that
@@ -204,7 +204,7 @@
* otherwise it will be the current directory.
*/
# ifndef HACKDIR
-# define HACKDIR "/usr/games/lib/nethackdir"
+# define HACKDIR "FEDORA_HACKDIR"
# endif
/*
@@ -214,7 +214,7 @@
* since the user might create files in a directory of his choice.
* Of course SECURE is meaningful only if HACKDIR is defined.
*/
-/* #define SECURE */ /* do setuid(getuid()) after chdir() */
+#define SECURE /* do setuid(getuid()) after chdir() */
/*
* If it is desirable to limit the number of people that can play Hack
@@ -300,7 +300,7 @@
* functions that have been macroized.
*/
-/* #define VISION_TABLES */ /* use vision tables generated at compile time */
+#define VISION_TABLES /* use vision tables generated at compile time */
#ifndef VISION_TABLES
# ifndef NO_MACRO_CPATH
# define MACRO_CPATH /* use clear_path macros instead of functions */
@@ -338,7 +338,7 @@
#endif
#define EXP_ON_BOTL /* Show experience on bottom line */
-/* #define SCORE_ON_BOTL */ /* added by Gary Erickson (erickson at ucivax) */
+#define SCORE_ON_BOTL /* added by Gary Erickson (erickson at ucivax) */
/*
* Section 5: EXPERIMENTAL STUFF
--- include/unixconf.h.orig 2003-12-07 18:39:13.000000000 -0500
+++ include/unixconf.h 2005-06-25 20:23:26.000000000 -0400
@@ -37,7 +37,7 @@
#define NETWORK /* if running on a networked system */
/* e.g. Suns sharing a playground through NFS */
/* #define SUNOS4 */ /* SunOS 4.x */
-/* #define LINUX */ /* Another Unix clone */
+#define LINUX /* Another Unix clone */
/* #define CYGWIN32 */ /* Unix on Win32 -- use with case sensitive defines */
/* #define GENIX */ /* Yet Another Unix Clone */
/* #define HISX */ /* Bull Unix for XPS Machines */
@@ -96,13 +96,13 @@
*/
/* #define NO_FILE_LINKS */ /* if no hard links */
-/* #define LOCKDIR "/usr/games/lib/nethackdir" */ /* where to put locks */
+#define LOCKDIR "FEDORA_STATEDIR" /* where to put locks */
/*
* If you want the static parts of your playground on a read-only file
* system, define VAR_PLAYGROUND to be where the variable parts are kept.
*/
-/* #define VAR_PLAYGROUND "/var/lib/games/nethack" */
+#define VAR_PLAYGROUND "FEDORA_STATEDIR"
/*
@@ -132,7 +132,7 @@
* "extra output" method is used, but not all systems provide access to
* a fine-grained timer.
*/
-/* #define TIMED_DELAY */ /* usleep() */
+#define TIMED_DELAY /* usleep() */
#endif
/*
@@ -204,7 +204,7 @@
* You can also include any other strange options your compress needs.
* If you have a normal compress, just leave it commented out.
*/
-/* #define COMPRESS_OPTIONS "-q" */
+#define COMPRESS_OPTIONS "-q9"
#endif
#define FCMASK 0660 /* file creation mask */
nethack-3.4.3-makefile.patch:
--- NEW FILE nethack-3.4.3-makefile.patch ---
--- sys/unix/Makefile.src.orig 2005-06-23 14:57:08.000000000 -0400
+++ sys/unix/Makefile.src 2005-06-23 15:03:21.000000000 -0400
@@ -124,8 +124,8 @@
# flags for Linux
# compile normally
-# CFLAGS = -O2 -fomit-frame-pointer -I../include
-# LFLAGS = -L/usr/X11R6/lib
+CFLAGS = $(RPM_OPT_FLAGS) -I../include
+LFLAGS = -L/usr/X11R6/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
@@ -151,8 +151,8 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include
-LFLAGS =
+#CFLAGS = -O -I../include
+#LFLAGS =
# The Qt and Be window systems are written in C++, while the rest of
# NetHack is standard C. If using Qt, uncomment the LINK line here to get
@@ -230,8 +230,8 @@
# WINTTYLIB = -ltermcap
# WINTTYLIB = -lcurses
# WINTTYLIB = -lcurses16
-# WINTTYLIB = -lncurses
-WINTTYLIB = -ltermlib
+WINTTYLIB = -lncurses
+#WINTTYLIB = -ltermlib
#
# libraries for X11
# If USE_XPM is defined in config.h, you will also need -lXpm here.
--- sys/unix/Makefile.utl.orig 2005-06-24 19:48:16.000000000 -0400
+++ sys/unix/Makefile.utl 2005-06-24 19:49:07.000000000 -0400
@@ -15,7 +15,7 @@
# if you are using gcc as your compiler,
# uncomment the CC definition below if it's not in your environment
-# CC = gcc
+CC = gcc
#
# For Bull DPX/2 systems at B.O.S. 2.0 or higher use the following:
#
@@ -72,8 +72,8 @@
# flags for Linux
# compile normally
-# CFLAGS = -O2 -fomit-frame-pointer -I../include
-# LFLAGS = -L/usr/X11R6/lib
+CFLAGS = $(RPM_OPT_FLAGS) -I../include
+LFLAGS = -L/usr/X11R6/lib
# OR compile backwards compatible a.out format
# CFLAGS = -O2 -b i486-linuxaout -fomit-frame-pointer -I../include
# LFLAGS = -b i486-linuxaout -L/usr/X11R6/lib
@@ -89,8 +89,8 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include
-LFLAGS =
+#CFLAGS = -O -I../include
+#LFLAGS =
LIBS =
@@ -101,11 +101,11 @@
# yacc/lex programs to use to generate *_comp.h, *_lex.c, and *_yacc.c.
# if, instead of yacc/lex you have bison/flex, comment/uncomment the following.
-YACC = yacc
-LEX = lex
-# YACC = bison -y
+#YACC = yacc
+#LEX = lex
+YACC = bison -y
# YACC = byacc
-# LEX = flex
+LEX = flex
# these are the names of the output files from YACC/LEX. Under MS-DOS
# and similar systems, they may differ
--- NEW FILE nethack.desktop ---
[Desktop Entry]
Name=NetHack
Comment=Nethack is a single player dungeon exploration game
Exec=nethack
Icon=nethack.xpm
Terminal=true
Type=Application
Encoding=UTF-8
Categories=Application;Game;Strategy;X-Fedora;
--- NEW FILE nethack.spec ---
%define nhgamedir /usr/games/nethack
%define nhdatadir /var/games/nethack
Name: nethack
Version: 3.4.3
Release: 1
Summary: A rouge-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
Patch0: %{name}-%{version}-makefile.patch
Patch1: %{name}-%{version}-config.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ncurses-devel, bison, flex, desktop-file-utils
Obsoletes: nethack-falconseye <= 1.9.4-6.a
%description
NetHack is a single player dungeon exploration game that runs on a
wide variety of computer systems, with a variety of graphical and text
interfaces all using the same game engine.
Unlike many other Dungeons & Dragons-inspired games, the emphasis in
NetHack is on discovering the detail of the dungeon and not simply
killing everything in sight - in fact, killing everything in sight is
a good way to die quickly.
Each game presents a different landscape - the random number generator
provides an essentially unlimited number of variations of the dungeon
and its denizens to be discovered by the player in one of a number of
characters: you can pick your race, your role, and your gender.
%prep
%setup -q
%patch0 -b .makefile
%patch1 -b .config
(source sys/unix/setup.sh)
# Set our paths
%{__sed} -i -e "s:^\(HACKDIR=\).*:\1%{nhgamedir}:" sys/unix/nethack.sh
%{__sed} -i -e "s:FEDORA_CONFDIR:%{nhgamedir}:" sys/unix/nethack.sh
%{__sed} -i -e "s:FEDORA_STATEDIR:%{nhdatadir}:" include/unixconf.h
%{__sed} -i -e "s:FEDORA_HACKDIR:%{nhgamedir}:" include/config.h
%{__sed} -i -e "s:/usr/games/lib/nethackdir:%{nhgamedir}:" \
doc/nethack.6 doc/nethack.txt doc/recover.6 doc/recover.txt
%build
make all
%install
rm -rf $RPM_BUILD_ROOT
%makeinstall \
GAMEDIR=$RPM_BUILD_ROOT%{nhgamedir} \
VARDIR=$RPM_BUILD_ROOT%{nhdatadir} \
SHELLDIR=$RPM_BUILD_ROOT%{_bindir} \
CHOWN=/bin/true \
CHGRP=/bin/true
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
install -D -p -m 0644 win/X11/nh_icon.xpm \
$RPM_BUILD_ROOT%{_datadir}/pixmaps/nethack.xpm
desktop-file-install \
--vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
--add-category X-Fedora \
--add-category Application \
--add-category Game \
%{SOURCE2}
%clean
rm -rf $RPM_BUILD_ROOT
%files
%defattr(-,root,root,-)
%doc doc/*.txt README dat/license dat/history
%doc dat/opthelp dat/wizhelp
%{_mandir}/man6/*
%{_datadir}/pixmaps/nethack.xpm
%{_datadir}/applications/fedora-nethack.desktop
%{nhgamedir}/license
%{nhgamedir}/nhdat
%{_bindir}/nethack
%{_bindir}/nethack-recover
%defattr(0664,root,games)
%config(noreplace) %{nhdatadir}/record
%config(noreplace) %{nhdatadir}/perm
%config(noreplace) %{nhdatadir}/logfile
%attr(0775,root,games) %dir %{nhdatadir}
%attr(0775,root,games) %dir %{nhdatadir}/save
%attr(2755,root,games) %{nhgamedir}/nethack
%changelog
* Sun Jul 10 2005 Luke Macken <lmacken at redhat.com> 3.4.3-1
- Initial package for Fedora Extras
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 19 Jul 2005 17:53:04 -0000 1.1
+++ .cvsignore 19 Jul 2005 17:53:54 -0000 1.2
@@ -0,0 +1 @@
+nethack-343-src.tgz
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 19 Jul 2005 17:53:04 -0000 1.1
+++ sources 19 Jul 2005 17:53:54 -0000 1.2
@@ -0,0 +1 @@
+21479c95990eefe7650df582426457f9 nethack-343-src.tgz
More information about the fedora-extras-commits
mailing list