From e353d29d732e7a02b17fc23aff04752afffd3f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=A0t=C4=9Bp=C3=A1n=20Kasal?= Date: Wed, 10 Jun 2009 14:57:35 +0000 Subject: [PATCH] new upstream version --- .cvsignore | 2 +- perl-DBD-MySQL.spec | 22 +++++++++++++--------- sources | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/.cvsignore b/.cvsignore index 3b26e5c..acdb046 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -DBD-mysql-4.010.tar.gz +DBD-mysql-4.011.tar.gz diff --git a/perl-DBD-MySQL.spec b/perl-DBD-MySQL.spec index e83a9f1..f095d72 100644 --- a/perl-DBD-MySQL.spec +++ b/perl-DBD-MySQL.spec @@ -1,5 +1,5 @@ Name: perl-DBD-MySQL -Version: 4.010 +Version: 4.011 Release: 1%{?dist} Summary: A MySQL interface for perl @@ -9,7 +9,9 @@ URL: http://search.cpan.org/dist/DBD-mysql/ Source0: http://www.cpan.org/authors/id/C/CA/CAPTTOFU/DBD-mysql-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# Prevent bug #443495 BuildRequires: perl(DBI) >= 1.607 + BuildRequires: mysql, mysql-devel, zlib-devel BuildRequires: perl(ExtUtils::MakeMaker) Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) @@ -22,11 +24,15 @@ An implementation of DBI for MySQL for Perl. %prep %setup -q -n DBD-mysql-%{version} # Correct file permissions -find . -type f -exec chmod -x {} ';' +find . -type f | xargs chmod -x + +for file in lib/DBD/mysql.pm ChangeLog; do + iconv -f iso-8859-1 -t utf-8 <$file >${file}_ && mv -f ${file}_ $file +done %build -%{__perl} Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" --ssl +perl Makefile.PL INSTALLDIRS=vendor OPTIMIZE="$RPM_OPT_FLAGS" --ssl make %{?_smp_mflags} @@ -38,12 +44,6 @@ find $RPM_BUILD_ROOT -type f -name '*.bs' -empty -exec rm -f {} ';' find $RPM_BUILD_ROOT -type d -depth -exec rmdir {} 2>/dev/null ';' %{_fixperms} $RPM_BUILD_ROOT/* -for file in $RPM_BUILD_ROOT%{_mandir}/man3/DBD::mysql.3pm \ - ChangeLog; do - iconv -f iso-8859-1 -t utf-8 < "$file" > "${file}_" - mv -f "${file}_" "$file" -done - %check # Full test coverage requires a live MySQL database @@ -64,6 +64,10 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Jun 10 2009 Stepan Kasal - 4.011-1 +- new upstream version +- apply iconv on primary source + * Mon Apr 6 2009 Marcela Mašláňová - 4.010-1 - update to the latest version diff --git a/sources b/sources index 29a5cdd..6092917 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a63c9f73afef70b6c80d899424b003e9 DBD-mysql-4.010.tar.gz +47c8d22282dfd0bcce7754c9d24e55fd DBD-mysql-4.011.tar.gz