rpms/nethack-vultures/devel nethack-vultures-1.11.0-config.patch, NONE, 1.1 nethack-vultures.spec, 1.7, 1.8
Karen Rei Pease (meme)
fedora-extras-commits at redhat.com
Thu Dec 15 22:38:39 UTC 2005
Author: meme
Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13855/devel
Modified Files:
nethack-vultures.spec
Added Files:
nethack-vultures-1.11.0-config.patch
Log Message:
Fixed and tested patch 2, tested patch 3 (no errors)
nethack-vultures-1.11.0-config.patch:
--- NEW FILE nethack-vultures-1.11.0-config.patch ---
--- vultures-1.11.0/nethack/include/config.h~ 2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.11.0/nethack/include/config.h 2005-11-15 21:44:26.000000000 +0200
@@ -150,10 +150,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
@@ -176,8 +176,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"
+#define COMPRESS_EXTENSION ".bz2"
/* 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 */
@@ -192,7 +192,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
@@ -221,7 +221,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
@@ -307,7 +307,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 */
@@ -345,7 +345,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
--- vultures-1.11.0/nethack/include/unixconf.h~ 2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.11.0/nethack/include/unixconf.h 2005-11-15 21:45:42.000000000 +0200
@@ -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 */
@@ -102,7 +102,7 @@
* 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 "/var/lib/games/nethack"
/*
@@ -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 */
--- vultures-1.11.0/slashem/include/config.h~ 2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/config.h 2005-11-15 21:46:27.000000000 +0200
@@ -206,10 +206,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
@@ -234,8 +234,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"
+#define COMPRESS_EXTENSION ".bz2"
/* An example of one alternative you might want to use: */
/* # define COMPRESS "/usr/local/bin/gzip" */ /* FSF gzip compression */
@@ -253,7 +253,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
@@ -275,7 +275,7 @@
# ifdef __APPLE__
# define HACKDIR "nethackdir" /* nethack directory */
# else
-# define HACKDIR "."
+# define HACKDIR "/usr/games/lib/nethackdir"
# endif
# endif
@@ -286,7 +286,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
@@ -374,7 +374,7 @@
* functions that have been macroized.
*/
/* WAC Can be defined under DJGPP, even though it's DOS*/
-/*#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 */
@@ -467,7 +467,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) */
/* #define BORG */ /* Works only under DOS */
/* #define KEEP_SAVE */ /* Keep savefiles after Restore (wac at intergate.bc.ca)*/
/* #define CHARON */ /* Charon's boat, enables Cerebus - not implemented */
--- vultures-1.11.0/slashem/include/unixconf.h~ 2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.11.0/slashem/include/unixconf.h 2005-11-15 21:46:58.000000000 +0200
@@ -38,7 +38,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 */
@@ -174,7 +174,7 @@
* 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 "/var/lib/games/nethack"
@@ -267,7 +267,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 */
Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- nethack-vultures.spec 15 Dec 2005 20:47:07 -0000 1.7
+++ nethack-vultures.spec 15 Dec 2005 22:38:37 -0000 1.8
@@ -1,6 +1,6 @@
Name: nethack-vultures
Version: 1.11.0
-Release: 4%{?dist}
+Release: 5%{?dist}
Summary: NetHack - Vulture's Eye and Vulture's Claw
Group: Amusements/Games
@@ -8,7 +8,7 @@
URL: http://www.darkarts.co.za/projects/vultures/
Source0: http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
Patch0: %{name}-1.11.0-optflags.patch
-Patch1: %{name}-1.10.1-config.patch
+Patch1: %{name}-1.11.0-config.patch
Patch2: %{name}-1.10.1-clawguide.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -160,6 +160,9 @@
%changelog
+* Thu Dec 15 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.0-5
+- That patch was fixed, but.. the folly of not checking all patches :P
+
* Thu Dec 15 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.0-4
- Once again with the patch - ah, the folly of doing diffs by hand. Last error.
More information about the scm-commits
mailing list