diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index 3d46cc4..c942f66 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -1,6 +1,6 @@ Name: perl-DBD-SQLite Version: 1.14 -Release: 5%{?dist}.1 +Release: 6%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries @@ -9,6 +9,9 @@ URL: http://search.cpan.org/dist/DBD-SQLite/ Source0: http://www.cpan.org/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# see http://rt.cpan.org/Public/Bug/Display.html?id=30558 +Patch0: rt32100.patch + BuildRequires: perl-DBI >= 1.03 # if sqlite >= 3.1.3 then # perl-DBD-SQLite uses the external library @@ -31,7 +34,7 @@ As of version 1.09 it can use the external SQLite library (>= 3.1.3). %prep %setup -q -n DBD-SQLite-%{version} - +%patch0 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -65,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Tue Mar 18 2008 Chris Weyl 1.14-6 +- apply sanity patches derived from RT#32100 + * Wed Feb 27 2008 Tom "spot" Callaway - 1.14-5.1 - Rebuild for perl 5.10 (again) diff --git a/rt32100.patch b/rt32100.patch new file mode 100644 index 0000000..ae9a996 --- /dev/null +++ b/rt32100.patch @@ -0,0 +1,20 @@ +--- dbdimp.c.orig 2008-03-18 17:37:18.580463431 -0700 ++++ dbdimp.c 2008-03-18 17:39:04.320466041 -0700 +@@ -399,7 +399,7 @@ + continue; + } + /* There are bug reports that say this should be sqlite3_reset() */ +- sqlite3_finalize(imp_sth->stmt); ++ sqlite3_reset(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -5; + } +@@ -419,7 +419,7 @@ + sqlite_trace(5, "exec ok - %d rows, %d cols\n", imp_sth->nrow, DBIc_NUM_FIELDS(imp_sth)); + return 0; + /* There are bug reports that say this should be sqlite3_reset() */ +- default: sqlite3_finalize(imp_sth->stmt); ++ default: sqlite3_reset(imp_sth->stmt); + sqlite_error(sth, (imp_xxh_t*)imp_sth, imp_sth->retval, (char*)sqlite3_errmsg(imp_dbh->db)); + return -6; + }