packages: mariadb/mariadb.spec, mariadb/mariadb-libevent.patch (NEW) - use ...

[arekm]

Author: arekm                        Date: Tue Jan 19 08:05:31 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- use external libevent

---- Files affected:
packages/mariadb:
   mariadb.spec (1.7 -> 1.8) , mariadb-libevent.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mariadb/mariadb.spec
diff -u packages/mariadb/mariadb.spec:1.7 packages/mariadb/mariadb.spec:1.8
--- packages/mariadb/mariadb.spec:1.7	Tue Jan 19 08:53:09 2010
+++ packages/mariadb/mariadb.spec	Tue Jan 19 09:05:26 2010
@@ -81,6 +81,7 @@
 #Patch12: mysql-NDB_CXXFLAGS.patch
 #Patch14: mysql-bug-18156.patch
 #Patch16:	mysql-bug-29082.patch
+Patch17:	%{name}-libevent.patch
 URL:		http://askmonty.org/wiki/index.php/MariaDB
 BuildRequires:	autoconf
 BuildRequires:	automake
@@ -480,6 +481,7 @@
 #%patch12 -p1 # OUTDATED?
 #%patch14 -p1 # OUTDATED?
 #%patch16 -p1 # NO FILE IN CVS
+%patch17 -p1
 
 %build
 %{__libtoolize}
@@ -967,6 +969,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.8  2010/01/19 08:05:26  arekm
+- use external libevent
+
 Revision 1.7  2010/01/19 07:53:09  arekm
 R/O fixes
 

================================================================
Index: packages/mariadb/mariadb-libevent.patch
diff -u /dev/null packages/mariadb/mariadb-libevent.patch:1.1
--- /dev/null	Tue Jan 19 09:05:31 2010
+++ packages/mariadb/mariadb-libevent.patch	Tue Jan 19 09:05:26 2010
@@ -0,0 +1,13 @@
+--- mariadb-5.1.41-rc/config/ac-macros/libevent.m4.org	2010-01-19 08:57:40.482393507 +0100
++++ mariadb-5.1.41-rc/config/ac-macros/libevent.m4	2010-01-19 08:58:17.459054751 +0100
+@@ -12,8 +12,8 @@
+   libevent_dir="libevent"
+   AC_SUBST([libevent_dir])
+ 
+-  libevent_libs="\$(top_builddir)/extra/libevent/libevent.a"
+-  libevent_includes="-I\$(top_srcdir)/extra/libevent"
++  libevent_libs="-levent"
++  libevent_includes=""
+   libevent_test_option="--mysqld=--thread-handling=pool-of-threads"
+   AC_SUBST(libevent_libs)
+   AC_SUBST(libevent_includes)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mariadb/mariadb.spec?r1=1.7&r2=1.8&f=u