From 0e082110d71c51d833a77edd13d158608841756c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcela=20Ma=C5=A1l=C3=A1=C5=88ov=C3=A1?= Date: Mon, 11 Jan 2010 14:50:48 +0000 Subject: [PATCH] - 543982 change Makefile.PL to compile with system sqlite --- perl-DBD-SQLite-bz543982.patch | 12 ++++++++++++ perl-DBD-SQLite.spec | 7 ++++++- rt32100.patch | 20 -------------------- 3 files changed, 18 insertions(+), 21 deletions(-) create mode 100644 perl-DBD-SQLite-bz543982.patch delete mode 100644 rt32100.patch diff --git a/perl-DBD-SQLite-bz543982.patch b/perl-DBD-SQLite-bz543982.patch new file mode 100644 index 0000000..6057ce0 --- /dev/null +++ b/perl-DBD-SQLite-bz543982.patch @@ -0,0 +1,12 @@ +diff -up DBD-SQLite-1.27/Makefile.PL.old DBD-SQLite-1.27/Makefile.PL +--- DBD-SQLite-1.27/Makefile.PL.old 2009-11-23 12:08:05.000000000 +0100 ++++ DBD-SQLite-1.27/Makefile.PL 2010-01-11 15:40:56.456399143 +0100 +@@ -123,7 +123,7 @@ if ( $@ or DBI->VERSION < $DBI_required + # a system sqlite is also sophisticated enough to have a patching system + # that can change the if ( 0 ) to if ( 1 ) + my ($sqlite_local, $sqlite_base, $sqlite_lib, $sqlite_inc); +-if ( 0 ) { ++if ( 1 ) { + require File::Spec; + if ( $sqlite_base = (grep(/SQLITE_LOCATION=.*/, @ARGV))[0] ) { + $sqlite_base =~ /=(.*)/; diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index acb6db8..59ab725 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -1,12 +1,13 @@ Name: perl-DBD-SQLite Version: 1.27 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Self Contained RDBMS in a DBI Driver Group: Development/Libraries License: GPL+ or Artistic URL: http://search.cpan.org/dist/DBD-SQLite/ Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/DBD-SQLite-%{version}.tar.gz +patch0: perl-DBD-SQLite-bz543982.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # if sqlite >= 3.1.3 then @@ -36,6 +37,7 @@ to install this module, and nothing else. %prep %setup -q -n DBD-SQLite-%{version} +%patch0 -p1 %build CFLAGS="$RPM_OPT_FLAGS" %{__perl} Makefile.PL INSTALLDIRS=vendor @@ -68,6 +70,9 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Jan 11 2009 Marcela Mašláňová - 1.27-3 +- 543982 change Makefile.PL to compile with system sqlite + * Mon Dec 7 2009 Stepan Kasal - 1.27-2 - rebuild against perl 5.10.1 diff --git a/rt32100.patch b/rt32100.patch deleted file mode 100644 index ae9a996..0000000 --- a/rt32100.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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; - }