Merge branch 'master' into f15

Conflicts: sysbench.spec
2011-09-07 00:07:18 +02:00 · 2011-09-07 00:07:18 +02:00 · 9f1c54a0ac
parent 399d29e2ca 7adb7ad6e5
commit 9f1c54a0ac
1 changed files with 5 additions and 1 deletions
--- a/sysbench.spec
+++ b/sysbench.spec
@ -1,7 +1,7 @@
 Summary:       System performance benchmark
 Name:          sysbench
 Version:       0.4.12
-Release:       4%{?dist}
+Release:       5%{?dist}
 License:       GPLv2+
 Group:         Applications/System
 Source0:       http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.gz
@ -12,6 +12,7 @@ BuildRequires: mysql-devel
 %if 0%{?rhel} != 4
 BuildRequires: postgresql-devel
 %endif
+BuildRequires: libaio-devel
 BuildRequires: automake
 BuildRequires: libtool

@ -68,6 +69,9 @@ 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)