From c467bf73b5ae39f193a9b20ca9ccfdfc9f287599 Mon Sep 17 00:00:00 2001
From: Warren Togami <wtogami@fedoraproject.org>
Date: Feb 11 2008 19:19:34 +0000
Subject: add katzj's gcc-4.3 build fix


---

diff --git a/bonnie++-1.03a-gcc43.patch b/bonnie++-1.03a-gcc43.patch
new file mode 100644
index 0000000..d700bf7
--- /dev/null
+++ b/bonnie++-1.03a-gcc43.patch
@@ -0,0 +1,20 @@
+diff -up bonnie++-1.03a/zcav.cpp.gcc43 bonnie++-1.03a/zcav.cpp
+--- bonnie++-1.03a/zcav.cpp.gcc43	2008-02-08 20:19:25.000000000 -0500
++++ bonnie++-1.03a/zcav.cpp	2008-02-08 20:19:37.000000000 -0500
+@@ -9,6 +9,7 @@ using namespace std;
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <stdlib.h>
++#include <string.h>
+ #include "bonnie.h"
+ #ifdef HAVE_VECTOR
+ #include <vector>
+@@ -72,7 +73,7 @@ int main(int argc, char *argv[])
+           usage();
+         userName = strdup(optarg);
+         int i;
+-        for(i = 0; userName[i] && userName[i] != ':'; i++);
++        for(i = 0; userName[i] && userName[i] != ':'; i++) ;
+         if(userName[i] == ':')
+         {
+           if(groupName)
diff --git a/bonnie++.spec b/bonnie++.spec
index 9c79819..4247e76 100644
--- a/bonnie++.spec
+++ b/bonnie++.spec
@@ -11,6 +11,7 @@ Source0:        http://www.coker.com.au/bonnie++/bonnie++-1.03a.tgz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
 
 Patch0:         bonnie++-1.03a-mandir.patch
+Patch1:         bonnie++-1.03a-gcc43.patch
 
 %description
 bonnie++ filesystem and disk benchmark suite aggressively reads & writes
@@ -24,7 +25,8 @@ test servers.
 
 %prep
 %setup -q -n bonnie++-1.03a
-%patch -p0
+%patch0 -p0
+%patch1 -p1
 sed -i 's|${INSTALL}\s\+-s\b|${INSTALL}|' Makefile