Changes - j0ke.net Open Build Service

Changes of Revision 13

[-] [+]	Changed	mysql-proxy.spec
@@ -5,6 +5,7 @@ Group: Applications/Databases License: GPLv2 Source0: %{name}-%{version}.tar.bz2 +Patch0: %{name}-%{version}-default-plugindir-arch.patch BuildRoot: %{_tmppath}/%{name}-%{version}-root BuildRequires: mysql-devel glib2-devel >= 2.16.0 gawk flex lua-devel >= 5.1 @@ -38,10 +39,10 @@ %prep %setup -q -n %{name}-%{version} - +%patch0 %build -%configure --libdir=%{_libdir} +%configure %__make %{?_smp_mflags} x 1 @@ -5,6 +5,7 @@ 2 Group: Applications/Databases 3 License: GPLv2 4 Source0: %{name}-%{version}.tar.bz2 5 +Patch0: %{name}-%{version}-default-plugindir-arch.patch 6 BuildRoot: %{_tmppath}/%{name}-%{version}-root 7 8 BuildRequires: mysql-devel glib2-devel >= 2.16.0 gawk flex lua-devel >= 5.1 9 @@ -38,10 +39,10 @@ 10 11 %prep 12 %setup -q -n %{name}-%{version} 13 - 14 +%patch0 15 16 %build 17 -%configure --libdir=%{_libdir} 18 +%configure 19 %__make %{?_smp_mflags} 20 21 22
[-] [+]	Added	mysql-proxy-0.8.1-default-plugindir-arch.patch ^
@@ -0,0 +1,28 @@ +--- src/chassis-frontend.c.orig 2011-07-14 10:55:39.022110431 +0200 ++++ src/chassis-frontend.c 2011-07-14 11:06:05.914648376 +0200 +@@ -320,8 +320,12 @@ + #ifdef WIN32 + plugin_dir = g_build_filename(base_dir, "bin", NULL); + #else ++#if defined(__64BIT__) ++ plugin_dir = g_build_filename(base_dir, "lib64", PACKAGE, "plugins", NULL); ++#else + plugin_dir = g_build_filename(base_dir, "lib", PACKAGE, "plugins", NULL); + #endif ++#endif + + _plugin_dir = plugin_dir; + +@@ -337,8 +341,12 @@ + #ifdef WIN32 + #define G_MODULE_PREFIX "plugin-" / we build the plugins with a prefix on win32 to avoid name-clashing in bin/ / + #else ++#if defined(__64BIT__) ++#define G_MODULE_PREFIX "lib64" ++#else + #define G_MODULE_PREFIX "lib" + #endif ++#endif + / we have to hack around some glib distributions that + * don't set the correct G_MODULE_SUFFIX, notably MacPorts + */