diff --git a/.gitignore b/.gitignore index f1b08af..e343598 100644 --- a/.gitignore +++ b/.gitignore @@ -17,3 +17,4 @@ DBD-mysql-4.017.tar.gz /DBD-mysql-4.033.tar.gz /DBD-mysql-4.034.tar.gz /DBD-mysql-4.035.tar.gz +/DBD-mysql-4.036.tar.gz diff --git a/DBD-mysql-4.035-Fix-nossl-option.patch b/DBD-mysql-4.035-Fix-nossl-option.patch deleted file mode 100644 index b746d36..0000000 --- a/DBD-mysql-4.035-Fix-nossl-option.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up DBD-mysql-4.035/Makefile.PL.orig DBD-mysql-4.035/Makefile.PL ---- DBD-mysql-4.035/Makefile.PL.orig 2016-08-16 15:10:57.626484971 +0200 -+++ DBD-mysql-4.035/Makefile.PL 2016-08-16 16:05:56.739956566 +0200 -@@ -680,8 +680,8 @@ section "Linker flags" or type - MSG - } - elsif ($param eq "nossl") { -- $opt->{$param} = ($opt->{"libs"} =~ /ssl/) ? 1 : 0; -- $source->{$param} = $opt->{$param} ? "choice" : "default"; -+ #$opt->{$param} = ($opt->{"libs"} =~ /ssl/) ? 1 : 0; -+ #$source->{$param} = $opt->{$param} ? "choice" : "default"; - } - elsif ($param eq "ssl") { - # default, for legacy reasons diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index f580991..b57b4cb 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -1,12 +1,11 @@ Name: perl-DBD-MySQL -Version: 4.035 -Release: 3%{?dist} +Version: 4.036 +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/M/MI/MICHIELB/DBD-mysql-%{version}.tar.gz -Patch0: DBD-mysql-4.035-Fix-nossl-option.patch BuildRequires: mariadb, mariadb-devel, zlib-devel BuildRequires: coreutils BuildRequires: findutils @@ -41,7 +40,6 @@ management system. %prep %setup -q -n DBD-mysql-%{version} -%patch0 -p1 # Correct file permissions find . -type f | xargs chmod -x @@ -62,13 +60,16 @@ find %{buildroot} -type f -name '*.bs' -empty -exec rm -f {} ';' %files %license LICENSE -%doc Changes README.pod +%doc Changes README.md %{perl_vendorarch}/Bundle/ %{perl_vendorarch}/DBD/ %{perl_vendorarch}/auto/DBD/ %{_mandir}/man3/*.3* %changelog +* Mon Aug 29 2016 Jitka Plesnikova - 4.036-1 +- 4.036 bump + * Thu Aug 18 2016 Jitka Plesnikova - 4.035-3 - Remove using of iconv, because it is not needed (bug #1368046) diff --git a/sources b/sources index 2a2af88..9ffd8e2 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -ac515fb4415c02cb6450fc2ff7f274fc DBD-mysql-4.035.tar.gz +fdee1d8dc4ae54bc6cb7cd5a3f3d3342 DBD-mysql-4.036.tar.gz