rpms/nethack-vultures/devel nethack-vultures-1.11.0-optflags.patch, 1.2, 1.3 nethack-vultures.spec, 1.6, 1.7

Karen Rei Pease (meme) fedora-extras-commits at redhat.com
Thu Dec 15 20:47:09 UTC 2005


Author: meme

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

Modified Files:
	nethack-vultures-1.11.0-optflags.patch nethack-vultures.spec 
Log Message:
Ah, the follies of tweaking patches by hand.  I tested this time, I swear,
it works!  :)



nethack-vultures-1.11.0-optflags.patch:

Index: nethack-vultures-1.11.0-optflags.patch
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures-1.11.0-optflags.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 19:45:58 -0000	1.2
+++ nethack-vultures-1.11.0-optflags.patch	15 Dec 2005 20:47:07 -0000	1.3
@@ -1,16 +1,16 @@
---- vultures-1.11.1/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.src~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.src	2005-11-15 16:44:21.000000000 +0200
 @@ -153,7 +153,7 @@
  
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
  VULTURESCFLAGS = -Wall -g
--CFLAGS = -g -I../include -I ../win/vultures/
+-CFLAGS = -g -I../include -I ../win/vultures
 +CFLAGS = $(RPM_OPT_FLAGS) -I../include -I../win/vultures/
  LFLAGS = 
  
  # The Qt and Be window systems are written in C++, while the rest of
---- vultures-1.11.1/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
-+++ vultures-1.11.1/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
+--- vultures-1.11.0/nethack/sys/unix/Makefile.utl~	2005-11-11 10:47:34.000000000 +0200
++++ vultures-1.11.0/nethack/sys/unix/Makefile.utl	2005-11-15 16:44:49.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include
@@ -20,8 +20,8 @@
  LFLAGS =
  
  LIBS =
---- vultures-1.11.1/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.src~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.src	2005-11-15 16:45:05.000000000 +0200
 @@ -147,7 +157,7 @@
 
  # VULTURESCFLAGS will be passed to the sub-makefile for vultures
@@ -31,8 +31,8 @@
  LFLAGS =
  
  # Only used for the Gnome interface.
---- vultures-1.11.1/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
-+++ vultures-1.11.1/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
+--- vultures-1.11.0/slashem/sys/unix/Makefile.utl~	2005-11-11 10:47:37.000000000 +0200
++++ vultures-1.11.0/slashem/sys/unix/Makefile.utl	2005-11-15 16:45:14.000000000 +0200
 @@ -89,7 +89,7 @@
  # flags for debugging:
  # CFLAGS = -g -I../include


Index: nethack-vultures.spec
===================================================================
RCS file: /cvs/extras/rpms/nethack-vultures/devel/nethack-vultures.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- nethack-vultures.spec	15 Dec 2005 19:45:58 -0000	1.6
+++ nethack-vultures.spec	15 Dec 2005 20:47:07 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           nethack-vultures
 Version:        1.11.0
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        NetHack - Vulture's Eye and Vulture's Claw
 
 Group:          Amusements/Games
@@ -160,6 +160,9 @@
 
 
 %changelog
+* 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.
+
 * Thu Dec 15 2005 Karen Pease <meme at daughtersoftiresias.org> - 1.11.0-3
 - Didn't quite get that patch right.
 




More information about the fedora-extras-commits mailing list