rpms/libofa/devel libofa-0.9.3-gcc43.patch, 1.1, 1.2 libofa.spec, 1.6, 1.7

[Rex Dieter (rdieter)]

Author: rdieter

Update of /cvs/pkgs/rpms/libofa/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8482

Modified Files:
	libofa-0.9.3-gcc43.patch libofa.spec 
Log Message:
* Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-13
- multiarch conflicts (#342271)
- tweak gcc43


libofa-0.9.3-gcc43.patch:

Index: libofa-0.9.3-gcc43.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libofa/devel/libofa-0.9.3-gcc43.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- libofa-0.9.3-gcc43.patch	12 Feb 2008 22:49:45 -0000	1.1
+++ libofa-0.9.3-gcc43.patch	3 Apr 2008 15:05:47 -0000	1.2
@@ -5,7 +5,7 @@
  
  -------------------------------------------------------------------*/
  
-+#include <string.h>
++#include <cstring>
  #include "protocol.h"
  
  AudioData* loadWaveFile(char *file);
@@ -17,7 +17,7 @@
  #include <stdio.h>
  #include <stdlib.h>
 -#include <string>
-+#include <string.h>
++#include <cstring>
  #include <map>
  #include <expat.h>
  #include <curl/curl.h>
@@ -29,7 +29,7 @@
  
  
  #include <math.h>
-+#include <stdlib.h>
++#include <cstdlib>
  #include "signal_op.h"
  #include "AFLIB/aflibConverter.h"
  #include "error_op.h"


Index: libofa.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libofa/devel/libofa.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- libofa.spec	12 Feb 2008 22:49:45 -0000	1.6
+++ libofa.spec	3 Apr 2008 15:05:47 -0000	1.7
@@ -4,7 +4,7 @@
 Summary: 	Open Fingerprint Architecture library	
 Name:		libofa	
 Version:	0.9.3	
-Release:	12%{?dist}
+Release:	13%{?dist}
 
 License:	GPLv2
 Source0:	http://www.musicdns.org/themes/musicdns_org/downloads/libofa-%{version}.tar.gz
@@ -75,7 +75,7 @@
 
 # prepare docs
 make -C examples clean
-rm -rf examples/.deps
+rm -rf examples/.deps examples/Makefile examples/*.gcc43
 
 
 %clean
@@ -101,6 +101,10 @@
 
 
 %changelog
+* Thu Apr 03 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-13
+- multiarch conflicts (#342271)
+- tweak gcc43
+
 * Tue Feb 12 2008 Rex Dieter <rdieter at fedoraproject.org> 0.9.3-12 
 - gcc43 patch