rpms/ctapi-cyberjack/F-11 ctapi-cyberjack-gcc44.patch, NONE, 1.1 ctapi-cyberjack.spec, 1.38, 1.39

[Miloš Jakubíček]

Author: mjakubicek

Update of /cvs/pkgs/rpms/ctapi-cyberjack/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4299/F-11

Modified Files:
	ctapi-cyberjack.spec 
Added Files:
	ctapi-cyberjack-gcc44.patch 
Log Message:
- Fix FTBFS: added ctapi-cyberjack-gcc44.patch



ctapi-cyberjack-gcc44.patch:

--- NEW FILE ctapi-cyberjack-gcc44.patch ---
--- ctapi/ctapi.cpp.orig	2009-04-29 02:55:19.000000000 +0200
+++ ctapi/ctapi.cpp	2009-04-29 02:55:36.000000000 +0200
@@ -49,7 +49,7 @@
 #include <sys/stat.h>
 #include <pwd.h>
 #include <sys/types.h>
-
+#include <cstdio>
 
 #if 1
 # define DEBUGP(ctn, format, args...) \
--- tools/cyberjack/lib/cm_distri.cpp.orig	2009-04-29 03:05:39.000000000 +0200
+++ tools/cyberjack/lib/cm_distri.cpp	2009-04-29 03:05:47.000000000 +0200
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <errno.h>
 #include <string.h>
-
+#include <cstdio>
 
 
 bool CM_Distri::check(std::string &xmlString,
--- tools/cyberjack/lib/cm_reader.cpp.orig	2009-04-29 03:06:18.000000000 +0200
+++ tools/cyberjack/lib/cm_reader.cpp	2009-04-29 03:06:28.000000000 +0200
@@ -21,7 +21,7 @@
 #include <unistd.h>
 #include <sys/types.h>
 #include <fcntl.h>
-
+#include <cstdio>
 
 
 #define CYBERJACK_VENDOR_ID 0xc4b
--- tools/cyberjack/lib/checksuite.cpp.orig	2009-04-29 03:07:01.000000000 +0200
+++ tools/cyberjack/lib/checksuite.cpp	2009-04-29 03:07:08.000000000 +0200
@@ -24,7 +24,7 @@
 #include "cm_reader.h"
 #include "cm_services.h"
 #include "cm_uname.h"
-
+#include <cstdio>
 
 
 
--- tools/cyberjack/lib/cm_driver.cpp.orig	2009-04-29 03:11:53.000000000 +0200
+++ tools/cyberjack/lib/cm_driver.cpp	2009-04-29 03:12:24.000000000 +0200
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <assert.h>
 #include <dlfcn.h>
-
+#include <cstdio>
 
 
 typedef void (*CT_VERSION_FN)(uint8_t *vmajor,


Index: ctapi-cyberjack.spec
===================================================================
RCS file: /cvs/pkgs/rpms/ctapi-cyberjack/F-11/ctapi-cyberjack.spec,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -p -r1.38 -r1.39
--- ctapi-cyberjack.spec	24 Feb 2009 10:09:44 -0000	1.38
+++ ctapi-cyberjack.spec	29 Apr 2009 01:18:44 -0000	1.39
@@ -1,7 +1,7 @@
 Name:		ctapi-cyberjack
 Summary:	CT-API 1.1 driver for REINER SCT cyberjack USB chipcard reader
 Version:	3.3.0
-Release:	5%{?dist}
+Release:	6%{?dist}
 Requires(pre):	group(ctapiusers)
 Requires:	%{_libdir}/ctapi
 #ExcludeArch:	x86_64
@@ -25,8 +25,11 @@ License: 	LGPLv2+
 Group: 		Development/Libraries
 Source0: 	%{name}-%{version}.tar.gz
 Source1:	91-cyberjack.rules
-Source2:        91-cyberjack.rules.old
+Source2:	91-cyberjack.rules.old
 Source3:	ctapi.h
+# Filed into upstream bugtracker at:
+# http://sourceforge.net/tracker/?func=detail&aid=2783328&group_id=34542&atid=411633
+Patch0:		%{name}-gcc44.patch
 Buildroot: 	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %if %{withPCSC}
@@ -91,6 +94,7 @@ and an generic check tool for the reader
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0
 
 %build
 %if %{withPCSC}
@@ -99,7 +103,7 @@ and an generic check tool for the reader
 %configure --disable-pcsc
 %endif
 
-make %{?_smp_mflags} 
+make -k %{?_smp_mflags} 
 
 
 %install
@@ -181,6 +185,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/getdist.sh
 
 %changelog
+* Wed Apr 29 2009 Milos Jakubicek <xjakub at fi.muni.cz> - 3.3.0-6
+- Fix FTBFS: added ctapi-cyberjack-gcc44.patch
+
 * Tue Feb 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.3.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild