rpms/nethack-vultures/devel nethack-vultures-1.10.1-clawguide.patch, NONE, 1.1 nethack-vultures-1.10.1-config.patch, NONE, 1.1 nethack-vultures-1.10.1-log2stderr.patch, NONE, 1.1 nethack-vultures-1.10.1-optflags.patch, NONE, 1.1 nethack-vultures.spec, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Karen Rei Pease (meme)
fedora-extras-commits at redhat.com
Tue Nov 22 02:16:58 UTC 2005
Author: meme
Update of /cvs/extras/rpms/nethack-vultures/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21062/devel
Modified Files:
.cvsignore sources
Added Files:
nethack-vultures-1.10.1-clawguide.patch
nethack-vultures-1.10.1-config.patch
nethack-vultures-1.10.1-log2stderr.patch
nethack-vultures-1.10.1-optflags.patch nethack-vultures.spec
Log Message:
auto-import nethack-vultures-1.10.1-0.3 on branch devel from nethack-vultures-1.10.1-0.3.src.rpm
nethack-vultures-1.10.1-clawguide.patch:
--- NEW FILE nethack-vultures-1.10.1-clawguide.patch ---
--- slashem/sys/unix/Makefile.doc~ 2005-11-11 10:47:37.000000000 +0200
+++ slashem/sys/unix/Makefile.doc 2005-11-15 21:57:10.000000000 +0200
@@ -31,9 +31,9 @@
# GUIDECMD = cat Guidebook.txt
# GUIDECMD = type Guidebook.txt
# The following work better with groff-1.18, eg on Linux
-# GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
+GUIDECMD = tbl tmac.n Guidebook.mn | nroff -c -Tascii | $(COLCMD)
# GUIDECMD = tbl tmac.n Guidebook.mn | groff -Wall -mtty-char -Tascii -P-u -P-b
-GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
+# GUIDECMD = tbl tmac.n Guidebook.mn | nroff | $(COLCMD)
# the basic guidebook
Guidebook: Guidebook.mn
nethack-vultures-1.10.1-config.patch:
--- NEW FILE nethack-vultures-1.10.1-config.patch ---
--- vultures-1.10.1/nethack/include/config.h~ 2005-11-11 10:47:33.000000000 +0200
+++ vultures-1.10.1/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.10.1/nethack/include/unixconf.h~ 2005-11-11 10:47:32.000000000 +0200
+++ vultures-1.10.1/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.10.1/slashem/include/config.h~ 2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.10.1/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.10.1/slashem/include/unixconf.h~ 2005-11-11 10:47:39.000000000 +0200
+++ vultures-1.10.1/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 */
nethack-vultures-1.10.1-log2stderr.patch:
--- NEW FILE nethack-vultures-1.10.1-log2stderr.patch ---
--- vultures/win/jtp/jtp_gen.c~ 2005-11-11 10:47:45.000000000 +0200
+++ vultures/win/jtp/jtp_gen.c 2005-11-15 18:11:28.000000000 +0200
@@ -50,7 +50,7 @@
void jtp_write_log_message_va(int msgtype, const char *file, int line, const char *logmessage, va_list args)
{
- FILE *f;
+ FILE *f = NULL;
if (logmessage == NULL || *logmessage == '\0')
return;
@@ -74,12 +74,14 @@
if ((msgtype == JTP_LOG_DEBUG) && (JTP_LOG_WRITE_DEBUG == 0))
return;
+#if 0
f = fopen(JTP_LOG_FILENAME, "a");
if (!f)
{
perror("ERROR: could not open log file " JTP_LOG_FILENAME
" for appending");
}
+#endif
if (file != NULL)
{
fprintf(f ? : stderr, "[%s: %d] %s: ", jtp_basename(file), line,
nethack-vultures-1.10.1-optflags.patch:
--- NEW FILE nethack-vultures-1.10.1-optflags.patch ---
--- vultures-1.10.1/nethack/sys/unix/Makefile.src~ 2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.src 2005-11-15 16:44:21.000000000 +0200
@@ -164,7 +164,7 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -g -I../include -I../win/jtp/
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/jtp/
LFLAGS =
# The Qt and Be window systems are written in C++, while the rest of
--- vultures-1.10.1/nethack/sys/unix/Makefile.utl~ 2005-11-11 10:47:34.000000000 +0200
+++ vultures-1.10.1/nethack/sys/unix/Makefile.utl 2005-11-15 16:44:49.000000000 +0200
@@ -89,7 +89,7 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include -I../win/jtp -DVULTURESEYE
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/jtp -DVULTURESEYE
LFLAGS =
LIBS =
--- vultures-1.10.1/slashem/sys/unix/Makefile.src~ 2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.src 2005-11-15 16:45:05.000000000 +0200
@@ -157,7 +157,7 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include -I../win/jtp
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/jtp
LFLAGS =
# Only used for the Gnome interface.
--- vultures-1.10.1/slashem/sys/unix/Makefile.utl~ 2005-11-11 10:47:37.000000000 +0200
+++ vultures-1.10.1/slashem/sys/unix/Makefile.utl 2005-11-15 16:45:14.000000000 +0200
@@ -89,7 +89,7 @@
# flags for debugging:
# CFLAGS = -g -I../include
-CFLAGS = -O -I../include -I../win/jtp -DVULTURESCLAW
+CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/jtp -DVULTURESCLAW
LFLAGS =
LIBS =
--- NEW FILE nethack-vultures.spec ---
Name: nethack-vultures
Version: 1.10.1
Release: 0.3
Summary: NetHack - Vulture's Eye and Vulture's Claw
Group: Amusements/Games
License: NetHack General Public License
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.10.1-optflags.patch
Patch1: %{name}-1.10.1-config.patch
Patch2: %{name}-1.10.1-clawguide.patch
Patch3: %{name}-1.10.1-log2stderr.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: SDL-devel
BuildRequires: SDL_mixer-devel
BuildRequires: ncurses-devel
BuildRequires: byacc
BuildRequires: flex
BuildRequires: desktop-file-utils
BuildRequires: groff
Requires: /usr/bin/bzip2
Obsoletes: nethack-falconseye <= 1.9.4-6.a
%description
Vulture's Eye is a mouse-driven interface for NetHack that enhances
the visuals, audio and accessibility of the game, yet retains all the
original gameplay and game features. Vulture's Eye is based on
Falcon's Eye, but is greatly extended. Also included is Vulture's
Claw, which is based on the Slash'Em core.
%prep
%setup -q -n vultures-%{version}
%patch0 -p1
%patch1 -p1
%patch2
%patch3
sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vultureseye|g' \
nethack/doc/{nethack,recover}.6 nethack/include/config.h
sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vultureseye|g' \
nethack/include/unixconf.h
sed -i -e 's|/usr/games/lib/nethackdir|%{_prefix}/games/vulturesclaw|g' \
slashem/doc/{nethack,recover}.6 slashem/include/config.h
sed -i -e 's|/var/lib/games/nethack|%{_var}/games/vulturesclaw|' \
slashem/include/unixconf.h
%build
# Note: no %{?_smp_mflags} in any of these: various parallel build issues.
for i in nethack slashem ; do
make $i/Makefile
make -C $i
make -C $i/util recover dlb dgn_comp lev_comp
make -C $i/dat spec_levs quest_levs
done
%install
rm -rf $RPM_BUILD_ROOT
make -C nethack install CHGRP=: CHOWN=: \
GAMEDIR=$RPM_BUILD_ROOT%{_prefix}/games/vultureseye \
VARDIR=$RPM_BUILD_ROOT%{_var}/games/vultureseye \
SHELLDIR=$RPM_BUILD_ROOT%{_bindir}
make -C slashem install CHGRP=: CHOWN=: \
GAMEDIR=$RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw \
VARDIR=$RPM_BUILD_ROOT%{_var}/games/vulturesclaw \
SHELLDIR=$RPM_BUILD_ROOT%{_bindir}
install -dm 755 $RPM_BUILD_ROOT%{_mandir}/man6
install -pm 644 nethack/doc/nethack.6 \
$RPM_BUILD_ROOT%{_mandir}/man6/vultureseye.6
install -pm 644 nethack/doc/recover.6 \
$RPM_BUILD_ROOT%{_mandir}/man6/vultureseye-recover.6
install -pm 644 slashem/doc/nethack.6 \
$RPM_BUILD_ROOT%{_mandir}/man6/vulturesclaw.6
install -pm 644 slashem/doc/recover.6 \
$RPM_BUILD_ROOT%{_mandir}/man6/vulturesclaw-recover.6
install -dm 755 $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
for i in vultureseye vulturesclaw ; do
desktop-file-install \
--vendor=fedora \
--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
--mode=644 \
--add-category=X-Fedora \
dist/unix/desktop/$i.desktop
mv $RPM_BUILD_ROOT%{_prefix}/games/$i/*.png \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps/$i.png
mv $RPM_BUILD_ROOT%{_prefix}/games/$i/recover \
$RPM_BUILD_ROOT%{_bindir}/$i-recover
done
rm -r $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/manual
rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/manual
# Save some space
for f in graphics music sound ; do
rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
ln -s ../vultureseye/$f \
$RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
done
chmod -s $RPM_BUILD_ROOT%{_prefix}/games/vultures*/vultures* # for stripping
# Clean up
sed -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_bindir}/vultures{eye,claw}
rm $RPM_BUILD_ROOT%{_prefix}/games/vultures*/*.ico
%clean
rm -rf $RPM_BUILD_ROOT
%post
[ $1 -eq 1 ] && \
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
%postun
gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
%files
%defattr(-,root,root,-)
%doc nethack/README nethack/dat/license nethack/dat/history nethack/dat/*help
%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt vultures/win/jtp/gamedata/manual/
%{_bindir}/vultures*
%dir %{_prefix}/games/vultureseye/
%{_prefix}/games/vultureseye/config/
%{_prefix}/games/vultureseye/defaults.nh
%{_prefix}/games/vultureseye/graphics/
%{_prefix}/games/vultureseye/license
%{_prefix}/games/vultureseye/music/
%{_prefix}/games/vultureseye/nhdat
%{_prefix}/games/vultureseye/sound/
%attr(2755,root,games) %{_prefix}/games/vultureseye/vultureseye
%dir %{_prefix}/games/vulturesclaw/
%{_prefix}/games/vulturesclaw/config/
%{_prefix}/games/vulturesclaw/defaults.nh
%{_prefix}/games/vulturesclaw/graphics/
%{_prefix}/games/vulturesclaw/Guidebook.txt
%{_prefix}/games/vulturesclaw/license
%{_prefix}/games/vulturesclaw/music/
%{_prefix}/games/vulturesclaw/nh*share
%{_prefix}/games/vulturesclaw/sound/
%attr(2755,root,games) %{_prefix}/games/vulturesclaw/vulturesclaw
%{_datadir}/applications/*vultures*.desktop
%{_datadir}/icons/hicolor/48x48/apps/vultures*.png
%{_mandir}/man6/vultures*.6*
%defattr(664,root,games,775)
%dir %{_var}/games/vultureseye/
%config(noreplace) %{_var}/games/vultureseye/record
%config(noreplace) %{_var}/games/vultureseye/perm
%config(noreplace) %{_var}/games/vultureseye/logfile
%dir %{_var}/games/vultureseye/save/
%dir %{_var}/games/vulturesclaw/
%config(noreplace) %{_var}/games/vulturesclaw/record
%config(noreplace) %{_var}/games/vulturesclaw/perm
%config(noreplace) %{_var}/games/vulturesclaw/logfile
%dir %{_var}/games/vulturesclaw/save/
%changelog
* Mon Nov 21 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.10.1-0.3
- Applied patch 3 (log2stderr)
* Tue Nov 16 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.10.1-0.2
- Upped revision
- Removed timidity++ dep
- Fixed manual installation
- Put stderr patch back in.
* Tue Nov 15 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.10.1-0.1
- Took over maintainership of package
- Handled TODOs
* Tue Nov 15 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.10.1-0.1
- 1.10.1, log crash fix applied upstream.
* Mon Nov 7 2005 Ville Skyttä <ville.skytta at iki.fi> - 1.10.0-0.1
- First build, based on my, Karen Pease's and Luke Macken's related work.
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 22 Nov 2005 02:10:53 -0000 1.1
+++ .cvsignore 22 Nov 2005 02:16:56 -0000 1.2
@@ -0,0 +1 @@
+vultures-1.10.1-full.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 22 Nov 2005 02:10:54 -0000 1.1
+++ sources 22 Nov 2005 02:16:56 -0000 1.2
@@ -0,0 +1 @@
+5a6b99e6159e358757991a6221871b89 vultures-1.10.1-full.tar.bz2
More information about the fedora-extras-commits
mailing list