rpms/poker-eval/F-10 poker-eval-135.0-exit.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 poker-eval.spec, 1.18, 1.19 sources, 1.6, 1.7

[Christopher Stone]

Author: xulchris

Update of /cvs/pkgs/rpms/poker-eval/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24912/F-10

Modified Files:
	.cvsignore poker-eval.spec sources 
Added Files:
	poker-eval-135.0-exit.patch 
Log Message:
upstream sync, remove exit calls from lib

poker-eval-135.0-exit.patch:

--- NEW FILE poker-eval-135.0-exit.patch ---
--- lib/combinations.c~	2009-01-01 14:12:46.000000000 -0800
+++ lib/combinations.c	2009-01-01 14:42:53.000000000 -0800
@@ -91,7 +91,8 @@
         break;
       }
     }
-    if (firstIncr == -1) { printf("BUG!\n"); exit(1); }
+    if (firstIncr == -1) 
+      return NULL;
     for (i=0; i<firstIncr; i++)
       combo->combos[i][j] = combo->combos[i][j-1];
     for (i=firstIncr+1; i<combo->nelem; i++)
--- lib/evx_generate.c~	2009-01-01 14:12:18.000000000 -0800
+++ lib/evx_generate.c	2009-01-01 14:12:34.000000000 -0800
@@ -69,7 +69,7 @@
   fp = fopen ("evx_preamble.cfrag", "r");
   if (fp == NULL) {
       fprintf (stderr, "Unable to read evx_preamble.c\n");
-      exit (-1);
+      return -1;
     }
   puts("/* This file is machine-generated -- DO NOT EDIT! */\n");
   {
--- include/enumerate.h~	2009-01-01 17:06:31.000000000 -0800
+++ include/enumerate.h	2009-01-01 17:09:40.000000000 -0800
@@ -641,7 +641,7 @@
         if (!deck##_CardMask_ANY_SET(_unavail, set_var[_i])) \
           break;	/* this hand is available for player i */ \
       } \
-      if (_j == _ncombo[_i]) { printf("not enough cards\n"); exit(1); } \
+      if (_j == _ncombo[_i]) { printf("not enough cards\n"); return(1); } \
       deck##_CardMask_OR(_unavail, _unavail, set_var[_i]); \
       _curIndex[_i] = _j; \
     } \


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	23 May 2007 18:38:25 -0000	1.6
+++ .cvsignore	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-poker-eval-134.0.tar.gz
+poker-eval-135.0.tar.gz


Index: poker-eval.spec
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/poker-eval.spec,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- poker-eval.spec	24 May 2008 05:26:04 -0000	1.18
+++ poker-eval.spec	2 Jan 2009 01:31:20 -0000	1.19
@@ -1,6 +1,6 @@
 Name:           poker-eval
-Version:        134.0
-Release:        3%{?dist}
+Version:        135.0
+Release:        1%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
@@ -8,6 +8,7 @@
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
 Patch0:         %{name}-134.0-multiarch.patch
+Patch1:         %{name}-135.0-exit.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -30,6 +31,7 @@
 %prep
 %setup -q
 %patch0 -p0 -b .multiarch~
+%patch1 -p0 -b .exit~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -76,6 +78,10 @@
 
 
 %changelog
+* Thu Jan 01 2009 Christopher Stone <chris.stone at gmail.com> 135.0-1
+- Upstream sync
+- Add patch to remove exit calls from library
+
 * Fri May 23 2008 Christopher Stone <chris.stone at gmail.com> 134.0-3
 - Add patch to fix multiarch conflict (bz #342911)
 - Update license tag


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/poker-eval/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	23 May 2007 18:38:25 -0000	1.6
+++ sources	2 Jan 2009 01:31:20 -0000	1.7
@@ -1 +1 @@
-aa6d39fd3b9025fb47f25009cde60d9b  poker-eval-134.0.tar.gz
+17c31abfc40fe8719e9496f089e68df3  poker-eval-135.0.tar.gz