Wed Jul 8 16:24:57 UTC 2009

Author: scop

Update of /cvs/pkgs/rpms/nethack-vultures/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10930

Modified Files:
	.cvsignore nethack-vultures.spec sources 
Added Files:
	nethack-vultures-2.1.2-config.patch 
	nethack-vultures-2.1.2-logging.patch 
	nethack-vultures-2.1.2-tabfullscreen.patch 
	nethack-vultures.logrotate 
Removed Files:
	nethack-vultures-1.10.1-config.patch 
	nethack-vultures-1.10.1-log2stderr.patch 
	nethack-vultures-1.10.1-optflags.patch 
	nethack-vultures-1.11.0-config.patch 
	nethack-vultures-2.1.0-tabfullscreen.patch 
Log Message:
* Sat May 23 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 2.1.2-1
- Update to 2.1.2.
- Patch to log in %{_var}/log/vultures.
- Bring icon cache update scriptlets up to date with current guidelines.
- Simplify and improve space savings by using hardlink.
- Build with bison instead of byacc; bison is needed anyway.
- Drop default patch fuzz, apply it selectively.


nethack-vultures-2.1.2-config.patch:

--- NEW FILE nethack-vultures-2.1.2-config.patch ---
diff -up vultures-2.1.2/nethack/include/config.h~ vultures-2.1.2/nethack/include/config.h
--- vultures-2.1.2/nethack/include/config.h~	2008-07-16 16:59:02.000000000 +0300
+++ vultures-2.1.2/nethack/include/config.h	2009-05-23 01:06:43.000000000 +0300
@@ -153,10 +153,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
 
@@ -179,8 +179,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 */                                   
@@ -224,7 +224,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
@@ -310,7 +310,7 @@ typedef unsigned char	uchar;
  * 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 */
@@ -348,7 +348,7 @@ typedef unsigned char	uchar;
 #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
diff -up vultures-2.1.2/nethack/include/unixconf.h~ vultures-2.1.2/nethack/include/unixconf.h
--- vultures-2.1.2/nethack/include/unixconf.h~	2008-07-16 16:59:02.000000000 +0300
+++ vultures-2.1.2/nethack/include/unixconf.h	2009-05-23 01:06:50.000000000 +0300
@@ -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 */
diff -up vultures-2.1.2/slashem/include/config.h~ vultures-2.1.2/slashem/include/config.h
--- vultures-2.1.2/slashem/include/config.h~	2008-07-16 16:58:59.000000000 +0300
+++ vultures-2.1.2/slashem/include/config.h	2009-05-23 01:06:53.000000000 +0300
@@ -209,10 +209,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
 
@@ -237,8 +237,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 */
@@ -278,7 +278,7 @@
 #  ifdef __APPLE__
 #    define HACKDIR "nethackdir"      /* nethack directory */
 #  else
-#    define HACKDIR "."
+#    define HACKDIR "/usr/games/lib/nethackdir"
 #  endif
 # endif
 
@@ -289,7 +289,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
@@ -377,7 +377,7 @@ typedef unsigned char	uchar;
  * 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 */
@@ -470,7 +470,7 @@ typedef unsigned char	uchar;
 #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 */
diff -up vultures-2.1.2/slashem/include/unixconf.h~ vultures-2.1.2/slashem/include/unixconf.h
--- vultures-2.1.2/slashem/include/unixconf.h~	2008-07-16 16:58:59.000000000 +0300
+++ vultures-2.1.2/slashem/include/unixconf.h	2009-05-23 01:06:41.000000000 +0300
@@ -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"
 
 
 
@@ -271,7 +271,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-2.1.2-logging.patch:

--- NEW FILE nethack-vultures-2.1.2-logging.patch ---
diff -up vultures-2.1.2/vultures/vultures_gen.c~ vultures-2.1.2/vultures/vultures_gen.c
--- vultures-2.1.2/vultures/vultures_gen.c~	2008-07-16 16:59:01.000000000 +0300
+++ vultures-2.1.2/vultures/vultures_gen.c	2009-05-23 10:58:31.000000000 +0300
@@ -16,7 +16,7 @@
 #include "vultures_opt.h"
 
 /* Remove/undefine this to have all log messages end up in stderr */
-#define V_LOG_FILENAME "vultures_log.txt"
+#define V_LOG_FILENAME "/var/log/vultures/vultures_log.txt"
 
 
 extern void append_slash(char *);

nethack-vultures-2.1.2-tabfullscreen.patch:

--- NEW FILE nethack-vultures-2.1.2-tabfullscreen.patch ---
diff -up vultures-2.1.2/vultures/vultures_sdl.c~ vultures-2.1.2/vultures/vultures_sdl.c
--- vultures-2.1.2/vultures/vultures_sdl.c~	2008-07-16 16:59:01.000000000 +0300
+++ vultures-2.1.2/vultures/vultures_sdl.c	2009-05-23 01:04:04.000000000 +0300
@@ -276,7 +276,7 @@ static void vultures_set_fullscreen(void
         newwidth  = modes[bestmode]->w;
     }
 
-    vultures_screen = SDL_SetVideoMode(newwidth, newheight, 0, 
+    vultures_screen = SDL_SetVideoMode(newwidth, newheight, 32, 
                                        SDL_SWSURFACE | SDL_FULLSCREEN | SDL_ASYNCBLIT);
 
     vultures_win_resize(newwidth, newheight);
@@ -286,7 +286,7 @@ static void vultures_set_fullscreen(void
 
 static void vultures_set_windowed()
 {
-    vultures_screen = SDL_SetVideoMode(vultures_opts.width, vultures_opts.height, 0, 
+    vultures_screen = SDL_SetVideoMode(vultures_opts.width, vultures_opts.height, 32, 
                                        SDL_SWSURFACE |SDL_ASYNCBLIT | SDL_RESIZABLE);
     vultures_win_resize(vultures_opts.width, vultures_opts.height);
 }


--- NEW FILE nethack-vultures.logrotate ---
/var/log/vultures/vultures_log.txt {
    monthly
    nocreate
    notifempty
    missingok
}


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/nethack-vultures/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -p -r1.9 -r1.10
--- .cvsignore	7 Jun 2006 22:55:51 -0000	1.9
+++ .cvsignore	8 Jul 2009 16:24:56 -0000	1.10
@@ -1 +1 @@
-vultures-2.1.0-full.tar.bz2
+vultures-2.1.2-full.tar.bz2


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -p -r1.42 -r1.43
--- nethack-vultures.spec	26 Feb 2009 05:15:47 -0000	1.42
+++ nethack-vultures.spec	8 Jul 2009 16:24:57 -0000	1.43
@@ -1,16 +1,18 @@
 Name:           nethack-vultures
-Version:        2.1.0
-Release:        16%{?dist}
+Version:        2.1.2
+Release:        1%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
 License:        NGPL
 URL:            http://www.darkarts.co.za/projects/vultures/
-Source0:        http://www.darkarts.co.za/projects/vultures/downloads/vultures-%{version}/vultures-%{version}-full.tar.bz2
+Source0:        http://downloads.usrsrc.org/vultures/%{version}/vultures-%{version}-full.tar.bz2
+Source1:        %{name}.logrotate
 Patch0:         %{name}-1.11.0-optflags.patch
-Patch1:         %{name}-1.11.0-config.patch
+Patch1:         %{name}-2.1.2-config.patch
 Patch2:         %{name}-1.10.1-clawguide.patch
-Patch3:         %{name}-2.1.0-tabfullscreen.patch
+Patch3:         %{name}-2.1.2-tabfullscreen.patch
+Patch4:         %{name}-2.1.2-logging.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  SDL-devel
@@ -20,18 +22,18 @@ BuildRequires:  SDL_ttf-devel
 BuildRequires:  SDL-static
 BuildRequires:  libpng-devel
 BuildRequires:  ncurses-devel
-BuildRequires:  byacc
+BuildRequires:  bison
 BuildRequires:  flex
 BuildRequires:  desktop-file-utils
 BuildRequires:  groff
 BuildRequires:  util-linux
+BuildRequires:  hardlink
 Requires:       /usr/bin/bzip2
+Requires:       logrotate
 Requires(pre):  shadow-utils
 Requires(pre):  coreutils
 Obsoletes:      nethack-falconseye <= 1.9.4-6.a
 
-%define _default_patch_fuzz 2
-
 %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
@@ -44,8 +46,9 @@ Claw, which is based on the Slash'Em cor
 %setup -q -n vultures-%{version}
 %patch0 -p1
 %patch1 -p1
-%patch2
+%patch2 -F1
 %patch3 -p1
+%patch4 -p1
 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' \
@@ -61,9 +64,8 @@ sed -i -e 's|/var/lib/games/nethack|%{_v
 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/util recover dlb dgn_comp lev_comp YACC="bison -y"
     make -C $i/dat spec_levs quest_levs
-    cp vultures/gamedata/graphics/gametiles.bin vultures/gamedata/graphics/gametiles.bin.$i
 done
 
 
@@ -106,19 +108,10 @@ for i in vultureseye vulturesclaw ; do
         $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 music sound ; do
-    cp $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f/* $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/$f/
-    rm -r $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
-    ln -s ../vultureseye/$f \
-        $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/$f
-done
+rm -r $RPM_BUILD_ROOT%{_prefix}/games/vultures*/manual
 
-mv vultures/gamedata/graphics/gametiles.bin.nethack $RPM_BUILD_ROOT%{_prefix}/games/vultureseye/graphics/gametiles.bin
-mv vultures/gamedata/graphics/gametiles.bin.slashem $RPM_BUILD_ROOT%{_prefix}/games/vulturesclaw/graphics/gametiles.bin
+# Save quite a bit of space
+/usr/sbin/hardlink -cv $RPM_BUILD_ROOT%{_prefix}/games/vultures*
 
 chmod -s $RPM_BUILD_ROOT%{_prefix}/games/vultures*/vultures* # for stripping
 
@@ -126,25 +119,41 @@ chmod -s $RPM_BUILD_ROOT%{_prefix}/games
 sed -i -e "s|$RPM_BUILD_ROOT||" $RPM_BUILD_ROOT%{_bindir}/vultures{eye,claw}
 rm $RPM_BUILD_ROOT%{_prefix}/games/vultures*/*.ico
 
+install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/%{name}
+install -dm 775 $RPM_BUILD_ROOT%{_var}/log/vultures/
+
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %pre
 /usr/sbin/groupadd vultures 2> /dev/null || :
-# eliminate the old graphics directory symlink that was confusing rpm
-rm -rf %{_prefix}/games/vulturesclaw/graphics
+# Get dir symlinks that were there once out of the way
+for dir in graphics sound music ; do
+    [ -L %{_prefix}/games/vulturesclaw/$dir ] && \
+        rm -f %{_prefix}/games/vulturesclaw/$dir || :
+done
 
 %post
-[ $1 -eq 1 ] && \
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 %postun
-gtk-update-icon-cache -qf %{_datadir}/icons/hicolor &>/dev/null || :
+if [ $1 -eq 0 ] ; then
+    touch --no-create %{_datadir}/icons/hicolor &>/dev/null
+    gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+fi
+
+%posttrans
+gtk-update-icon-cache %{_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/gamedata/manual/
+%doc slashem/readme.txt slashem/history.txt slashem/slamfaq.txt
+%doc vultures/gamedata/manual/
+%config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %{_bindir}/vultures*
 %dir %{_prefix}/games/vultureseye/
 %{_prefix}/games/vultureseye/config/
@@ -155,6 +164,7 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 %{_prefix}/games/vultureseye/nhdat
 %{_prefix}/games/vultureseye/sound/
 %{_prefix}/games/vultureseye/fonts/
+%{_prefix}/games/vultureseye/tiles/
 %attr(2755,root,vultures) %{_prefix}/games/vultureseye/vultureseye
 %dir %{_prefix}/games/vulturesclaw/
 %{_prefix}/games/vulturesclaw/config/
@@ -166,6 +176,7 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 %{_prefix}/games/vulturesclaw/nh*share
 %{_prefix}/games/vulturesclaw/sound/
 %{_prefix}/games/vulturesclaw/fonts/
+%{_prefix}/games/vulturesclaw/tiles/
 %attr(2755,root,vultures) %{_prefix}/games/vulturesclaw/vulturesclaw
 %{_datadir}/applications/*vultures*.desktop
 %{_datadir}/icons/hicolor/48x48/apps/vultures*.png
@@ -181,9 +192,18 @@ gtk-update-icon-cache -qf %{_datadir}/ic
 %config(noreplace) %{_var}/games/vulturesclaw/perm
 %config(noreplace) %{_var}/games/vulturesclaw/logfile
 %dir %{_var}/games/vulturesclaw/save/
+%dir %{_var}/log/vultures/
 
 
 %changelog
+* Sat May 23 2009 Ville SkyttÃ¤ <ville.skytta at iki.fi> - 2.1.2-1
+- Update to 2.1.2.
+- Patch to log in %%{_var}/log/vultures.
+- Bring icon cache update scriptlets up to date with current guidelines.
+- Simplify and improve space savings by using hardlink.
+- Build with bison instead of byacc; bison is needed anyway.
+- Drop default patch fuzz, apply it selectively.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1.0-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/nethack-vultures/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	7 Jun 2006 22:55:51 -0000	1.8
+++ sources	8 Jul 2009 16:24:57 -0000	1.9
@@ -1 +1 @@
-f448f4fa74f07178683640a3f7985944  vultures-2.1.0-full.tar.bz2
+d31598c0e347648896c085fc961385d7  vultures-2.1.2-full.tar.bz2


--- nethack-vultures-1.10.1-config.patch DELETED ---


--- nethack-vultures-1.10.1-log2stderr.patch DELETED ---


--- nethack-vultures-1.10.1-optflags.patch DELETED ---


--- nethack-vultures-1.11.0-config.patch DELETED ---


--- nethack-vultures-2.1.0-tabfullscreen.patch DELETED ---


