- fix building with libevent 2.1

- rel 2

diff --git a/libevent-2.1.patch b/libevent-2.1.patch
new file mode 100644 (file)
index 0000000..e140f02
--- /dev/null
+++ b/libevent-2.1.patch
@@ -0,0 +1,23 @@
+--- mysql-proxy-0.8.4/src/chassis-mainloop.c~  2013-12-23 23:57:16.000000000 +0100
++++ mysql-proxy-0.8.4/src/chassis-mainloop.c   2017-04-04 19:55:23.933963035 +0200
+@@ -99,9 +99,9 @@
+ chassis *chassis_new() {
+       chassis *chas;
+ 
+-      if (0 != chassis_check_version(event_get_version(), _EVENT_VERSION)) {
++      if (0 != chassis_check_version(event_get_version(), LIBEVENT_VERSION)) {
+               g_critical("%s: chassis is build against libevent %s, but now runs against %s",
+-                              G_STRLOC, _EVENT_VERSION, event_get_version());
++                              G_STRLOC, LIBEVENT_VERSION, event_get_version());
+               return NULL;
+       }
+ 
+@@ -116,7 +116,7 @@
+ 
+       chas->threads = chassis_event_threads_new();
+ 
+-      chas->event_hdr_version = g_strdup(_EVENT_VERSION);
++      chas->event_hdr_version = g_strdup(LIBEVENT_VERSION);
+ 
+       chas->shutdown_hooks = chassis_shutdown_hooks_new();
+ 

diff --git a/mysql-proxy.spec b/mysql-proxy.spec
index b9ce7616ae7f90650a3c1f50905906880acd5125..cc7bbc0e21e9f41f84e08258b53cc03ae678c5dd 100644 (file)
--- a/mysql-proxy.spec
+++ b/mysql-proxy.spec
@@ -27,7 +27,7 @@ Summary:      MySQL Proxy
 Summary(pl.UTF-8):     Proxy MySQL
 Name:          mysql-proxy
 Version:       0.8.4
-Release:       1
+Release:       2
 License:       GPL v2
 Group:         Applications/Networking
 Source0:       ftp://mysql.mirror.kangaroot.net/pub/mysql/Downloads/MySQL-Proxy/%{name}-%{version}.tar.gz
@@ -37,6 +37,7 @@ Source2:      %{name}.sysconfig
 Source3:       %{name}.conf
 Source4:       admin-1.lua
 Patch0:                install-examples.patch
+Patch1:                libevent-2.1.patch
 URL:           http://forge.mysql.com/wiki/MySQL_Proxy
 BuildRequires: autoconf >= 2.62
 BuildRequires: automake
@@ -84,6 +85,7 @@ zapytań... i wiele więcej.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %{__sed} -i -e 's/g_build_filename(base_dir, "lib"/g_build_filename(base_dir, "%{_lib}"/g' src/chassis-frontend.c
 %{__sed} -i -e 's/g_build_filename(srv->base_dir, "lib"/g_build_filename(srv->base_dir, "%{_lib}"/g' src/chassis-frontend.c