diff --git a/.gitignore b/.gitignore index fd23b2b..9400555 100644 --- a/.gitignore +++ b/.gitignore @@ -30,3 +30,4 @@ DBD-mysql-4.017.tar.gz /DBD-mysql-4.046.tar.gz /DBD-mysql-4.047.tar.gz /DBD-mysql-4.048.tar.gz +/DBD-mysql-4.049.tar.gz diff --git a/DBD-mysql-4.047-Fix-build-failures-with-MariaDB.patch b/DBD-mysql-4.047-Fix-build-failures-with-MariaDB.patch deleted file mode 100644 index 69931df..0000000 --- a/DBD-mysql-4.047-Fix-build-failures-with-MariaDB.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff -up DBD-mysql-4.047/dbdimp.c.orig DBD-mysql-4.047/dbdimp.c ---- DBD-mysql-4.047/dbdimp.c.orig 2018-09-11 15:12:38.921029672 +0200 -+++ DBD-mysql-4.047/dbdimp.c 2018-09-11 15:21:44.512417303 +0200 -@@ -1907,14 +1907,14 @@ MYSQL *mysql_dr_connect( - (SvTRUE(*svp) ? "utf8" : "latin1")); - } - --#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) -+#if (MYSQL_VERSION_ID >= 50723) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) - if ((svp = hv_fetch(hv, "mysql_get_server_pubkey", 23, FALSE)) && *svp && SvTRUE(*svp)) { - my_bool server_get_pubkey = 1; - mysql_options(sock, MYSQL_OPT_GET_SERVER_PUBLIC_KEY, &server_get_pubkey); - } - #endif - --#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_BASE_VERSION) -+#if (MYSQL_VERSION_ID >= 50600) && (MYSQL_VERSION_ID < MARIADB_VERSION_ID) - if ((svp = hv_fetch(hv, "mysql_server_pubkey", 19, FALSE)) && *svp) { - STRLEN plen; - char *server_pubkey = SvPV(*svp, plen); diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index 9f48f08..8fa8ad7 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -1,13 +1,11 @@ Name: perl-DBD-MySQL -Version: 4.048 +Version: 4.049 Release: 1%{?dist} Summary: A MySQL interface for Perl Group: Development/Libraries License: GPL+ or Artistic URL: https://metacpan.org/release/DBD-mysql -Source0: https://cpan.metacpan.org/authors/id/M/MI/MICHIELB/DBD-mysql-%{version}.tar.gz -# Fix build with MariaDB -Patch0: DBD-mysql-4.047-Fix-build-failures-with-MariaDB.patch +Source0: https://cpan.metacpan.org/authors/id/D/DV/DVEEDEN/DBD-mysql-%{version}.tar.gz BuildRequires: coreutils BuildRequires: findutils BuildRequires: gcc @@ -47,7 +45,6 @@ management system. %prep %setup -q -n DBD-mysql-%{version} -%patch0 -p1 # Correct file permissions find . -type f | xargs chmod -x @@ -74,6 +71,9 @@ find %{buildroot} -type f -name '*.bs' -empty -delete %{_mandir}/man3/*.3* %changelog +* Mon Nov 19 2018 Jitka Plesnikova - 4.049-1 +- 4.049 bump + * Mon Sep 17 2018 Jitka Plesnikova - 4.048-1 - 4.048 bump diff --git a/sources b/sources index 77a36bb..215f9b4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (DBD-mysql-4.048.tar.gz) = 30a3c9d38f9331a20e2c4c65bfbb547443d888afb35c7fd42c8220797d8ecf79640d95736a6fb3ebc4df71c25366e93c19ba37b258aa17e7c5623a1404607e62 +SHA512 (DBD-mysql-4.049.tar.gz) = e0e1376927be3afd366e3fff4e221e8ecc57339644c8e420e34b9e45a802e2a2a2c294fdd7ca0c59a84d6236f7d0e8fd2000b5da8f6839444d3318e3b7d9b422