Merge branch 'master' into el5

Conflicts:
	.gitignore
	sources
	sysbench.spec

sources

@@ -1 +1 @@
-0820760bb16783ae51994aed794f952d  sysbench-0.4.10.tar.gz
+3a6d54fdd3fe002328e4458206392b9d  sysbench-0.4.12.tar.gz

sysbench.spec

@@ -1,7 +1,7 @@
 Summary:       System performance benchmark
 Name:          sysbench
-Version:       0.4.10
-Release:       3%{?dist}
+Version:       0.4.12
+Release:       5%{?dist}
 License:       GPLv2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@@ -12,6 +12,9 @@ BuildRequires: mysql-devel
 %if 0%{?rhel} != 4
 BuildRequires: postgresql-devel
 %endif
+BuildRequires: libaio-devel
+BuildRequires: automake
+BuildRequires: libtool
 
 
 %description
@@ -39,6 +42,8 @@ benchmarks and third-party plug-in modules.
 
 
 %build
+touch NEWS AUTHORS
+autoreconf -vif
 %configure --with-mysql \
 %if 0%{?rhel} != 4
           --with-pgsql
@@ -64,6 +69,27 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Sep 06 2011 Xavier Bachelot <xavier@bachelot.org> 0.4.12-5
+- Add BR: libaio-devel (rhbz#735882).
+
+* Wed Mar 23 2011 Dan Horák <dan@danny.cz> - 0.4.12-4
+- rebuilt for mysql 5.5.10 (soname bump in libmysqlclient)
+
+* Wed Feb 09 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.12-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Fri Dec 24 2010 Xavier Bachelot <xavier@bachelot.org> 0.4.12-2
+- Rebuild against new mysql.
+
+* Tue Jul 07 2010 Xavier Bachelot <xavier@bachelot.org> 0.4.12-1
+- Update to 0.4.12.
+
+* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.4.10-5
+- rebuilt with new openssl
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.4.10-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Wed Mar 18 2009 Xavier Bachelot <xavier@bachelot.org> 0.4.10-3
 - License is GPLv2+, not GPLv2.