- fix is_prefix symbol resolving

- ensure no missing symbols (-Werror=implicit-function-declaration)
- rel 5

Changed files:
    headers.patch -> 1.1
    perl-DBD-mysql.spec -> 1.79

diff --git a/headers.patch b/headers.patch
new file mode 100644 (file)
index 0000000..57ef9d5
--- /dev/null
+++ b/headers.patch
@@ -0,0 +1,20 @@
+--- DBD-mysql-4.018/dbdimp.h~  2010-07-10 17:53:52.000000000 +0300
++++ DBD-mysql-4.018/dbdimp.h   2011-04-04 14:18:05.002129843 +0300
+@@ -333,3 +333,6 @@
+ 
+ extern int mysql_db_reconnect(SV*);
+ int mysql_st_free_result_sets (SV * sth, imp_sth_t * imp_sth);
++#if MYSQL_VERSION_ID >= MULTIPLE_RESULT_SET_VERSION
++int dbd_st_more_results(SV* sth, imp_sth_t* imp_sth);
++#endif
+--- DBD-mysql-4.018/dbdimp.h~  2011-04-04 14:19:08.000000000 +0300
++++ DBD-mysql-4.018/dbdimp.h   2011-04-04 14:20:32.302207311 +0300
+@@ -23,6 +23,8 @@
+ #include <mysqld_error.h>  /* Comes MySQL */
+ 
+ #include <errmsg.h> /* Comes with MySQL-devel */
++#define is_prefix mysql_is_prefix      /* namespace sanity */
++extern int is_prefix(const char *, const char *);
+ 
+ /*
+  * This is the version of MySQL wherer

diff --git a/perl-DBD-mysql.spec b/perl-DBD-mysql.spec
index e18d11ef14a9a7d48ca0247ff4b0f19fae8740a1..c502cbe3a19fecc2942738fe9ee94e6bd6ffe4e8 100644 (file)
--- a/perl-DBD-mysql.spec
+++ b/perl-DBD-mysql.spec
@@ -25,12 +25,13 @@ Summary(uk.UTF-8):  Perl-інтерфейс до MySQL
 Summary(zh_CN.UTF-8):  Perl 的 MySQL 界面。
 Name:          perl-DBD-mysql
 Version:       4.018
-Release:       4
+Release:       5
 # NOTE: libmysqlclient infects everything that links against it with GPL
 License:       GPL (Perl code also Artistic)
 Group:         Development/Languages/Perl
 Source0:       http://www.cpan.org/modules/by-module/DBD/CAPTTOFU/%{pdir}-%{pnam}-%{version}.tar.gz
 # Source0-md5: d1d4ee2f20910d6491d1b6216471b2f1
+Patch0:                headers.patch
 URL:           http://search.cpan.org/dist/DBD-mysql/
 BuildRequires: mysql-devel >= 5.0.27
 BuildRequires: perl-DBI >= 1.13
@@ -121,15 +122,17 @@ M(y)sql.pm та DBD::mSQL(mysql) реалізують два різних під
 
 %prep
 %setup -q -n %{pdir}-%{pnam}-%{version}
+%patch0 -p1
 # we don't need no bundles
 rm -rf lib/Bundle
 
 %build
 %{__perl} Makefile.PL \
+       --cflags="$(mysql_config --cflags) %{rpmcflags} -Werror=implicit-function-declaration" \
        INSTALLDIRS=vendor
+
 %{__make} \
        CC="%{__cc}" \
-       OPTIMIZE="%{rpmcflags}"
 
 %{?with_tests:%{__make} test}