diff --git a/.gitignore b/.gitignore index a7d504d..dd7f76a 100644 --- a/.gitignore +++ b/.gitignore @@ -20,3 +20,4 @@ DBD-mysql-4.017.tar.gz /DBD-mysql-4.036.tar.gz /DBD-mysql-4.037.tar.gz /DBD-mysql-4.038.tar.gz +/DBD-mysql-4.039.tar.gz diff --git a/DBD-mysql-4.038-Fix-condition-for-MariaDB.patch b/DBD-mysql-4.038-Fix-condition-for-MariaDB.patch deleted file mode 100644 index a32f6e7..0000000 --- a/DBD-mysql-4.038-Fix-condition-for-MariaDB.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up DBD-mysql-4.038/mysql.xs.orig DBD-mysql-4.038/mysql.xs ---- DBD-mysql-4.038/mysql.xs.orig 2016-10-20 15:49:17.317483735 +0200 -+++ DBD-mysql-4.038/mysql.xs 2016-10-20 15:50:17.261109698 +0200 -@@ -882,7 +882,7 @@ dbd_mysql_get_info(dbh, sql_info_type) - IV type = 0; - SV* retsv=NULL; - bool using_322=0; --#if MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 && !defined(net_buffer_length) - IV buffer_len; - #endif - -@@ -913,7 +913,7 @@ dbd_mysql_get_info(dbh, sql_info_type) - retsv = newSVpv("`", 1); - break; - case SQL_MAXIMUM_STATEMENT_LENGTH: --#if MYSQL_VERSION_ID >= 50709 -+#if MYSQL_VERSION_ID >= 50709 && !defined(net_buffer_length) - /* mysql_get_option() was added in mysql 5.7.3 */ - /* MYSQL_OPT_NET_BUFFER_LENGTH was added in mysql 5.7.9 */ - mysql_get_option(NULL, MYSQL_OPT_NET_BUFFER_LENGTH, &buffer_len); diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index 8368cc5..9b21602 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -1,13 +1,11 @@ Name: perl-DBD-MySQL -Version: 4.038 +Version: 4.039 Release: 1%{?dist} Summary: A MySQL interface for Perl Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/DBD-mysql/ Source0: http://www.cpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz -# The changes in DBD-mysql-4.038 break the build with current MariaDB -Patch0: DBD-mysql-4.038-Fix-condition-for-MariaDB.patch BuildRequires: mariadb, mariadb-devel, zlib-devel BuildRequires: coreutils BuildRequires: findutils @@ -42,7 +40,6 @@ management system. %prep %setup -q -n DBD-mysql-%{version} -%patch0 -p1 # Correct file permissions find . -type f | xargs chmod -x @@ -70,6 +67,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete %{_mandir}/man3/*.3* %changelog +* Wed Nov 16 2016 Jitka Plesnikova - 4.039-1 +- 4.039 bump + * Thu Oct 20 2016 Jitka Plesnikova - 4.038-1 - 4.038 bump diff --git a/sources b/sources index 9124213..823b875 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ad7a61f90da60f2606cc5ea9b87d13fa DBD-mysql-4.038.tar.gz +e47b3c525fdbbf7ea697d43e71efcc0e DBD-mysql-4.039.tar.gz