rpms/poker-eval/F-9 poker-eval-134.0-multiarch.patch, NONE, 1.1 poker-eval.spec, 1.17, 1.18

[Christopher Stone (xulchris)]

Author: xulchris

Update of /cvs/extras/rpms/poker-eval/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21371/F-9

Modified Files:
	poker-eval.spec 
Added Files:
	poker-eval-134.0-multiarch.patch 
Log Message:
Add patch to fix multiarch conflict (bz #342911)

poker-eval-134.0-multiarch.patch:

--- NEW FILE poker-eval-134.0-multiarch.patch ---
--- include/poker_config.h~	2008-05-23 21:43:18.000000000 -0700
+++ include/poker_config.h	2008-05-23 22:09:14.000000000 -0700
@@ -40,11 +40,6 @@
 /* #undef HAVE_INT8 */
 #endif /* HAVE_INT8 */
 
-#ifndef SIZEOF_LONG
-/* The size of a `long', as computed by sizeof. */
-#define SIZEOF_LONG 4
-#endif /* SIZEOF_LONG */
-
 #ifndef HAVE_INTTYPES_H
 /* Check if we have/need the inttypes include file */
 #define HAVE_INTTYPES_H 1
--- include/poker_config.h.in~	2008-05-23 21:43:11.000000000 -0700
+++ include/poker_config.h.in	2008-05-23 22:09:25.000000000 -0700
@@ -39,11 +39,6 @@
 #undef HAVE_INT8
 #endif /* HAVE_INT8 */
 
-#ifndef SIZEOF_LONG
-/* The size of a `long', as computed by sizeof. */
-#undef SIZEOF_LONG
-#endif /* SIZEOF_LONG */
-
 #ifndef HAVE_INTTYPES_H
 /* Check if we have/need the inttypes include file */
 #undef HAVE_INTTYPES_H
--- include/poker_defs.h~	2008-05-23 22:08:44.000000000 -0700
+++ include/poker_defs.h	2008-05-23 22:09:02.000000000 -0700
@@ -53,9 +53,6 @@
 #elif defined(HAVE_LONG_LONG)
 typedef unsigned long long      uint64;
 #define USE_INT64 1
-#elif SIZEOF_LONG == 8
-typedef unsigned long           uint64;
-#define USE_INT64 1
 #elif defined(UINT64_TYPE)
 typedef UINT64_TYPE             uint64;
 #define USE_INT64 1


Index: poker-eval.spec
===================================================================
RCS file: /cvs/extras/rpms/poker-eval/F-9/poker-eval.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- poker-eval.spec	20 Feb 2008 08:33:09 -0000	1.17
+++ poker-eval.spec	24 May 2008 05:25:48 -0000	1.18
@@ -1,12 +1,13 @@
 Name:           poker-eval
 Version:        134.0
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Poker hand evaluator library
 
 Group:          Development/Libraries
-License:        GPL
+License:        GPLv2+
 URL:            http://pokersource.org/poker-eval
 Source0:        http://download.gna.org/pokersource/sources/%{name}-%{version}.tar.gz
+Patch0:         %{name}-134.0-multiarch.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 
@@ -28,6 +29,7 @@
 
 %prep
 %setup -q
+%patch0 -p0 -b .multiarch~
 
 # use examples/ directory for devel package %doc section
 mkdir -p tmp/examples && cp examples/*.c tmp/examples
@@ -74,7 +76,11 @@
 
 
 %changelog
-* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> - 134.0-2
+* 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
+
+* Wed Feb 20 2008 Fedora Release Engineering <rel-eng at fedoraproject.org> 134.0-2
 - Autorebuild for GCC 4.3
 
 * Wed May 23 2007 Christopher Stone <chris.stone at gmail.com> 134.0-1