8
0
OBS User unknown
2008-02-08 19:21:57 +00:00
committed by Git OBS Bridge
parent 25f35075dc
commit be4efad97a
3 changed files with 40 additions and 11 deletions

View File

@@ -1,3 +1,8 @@
-------------------------------------------------------------------
Thu Feb 7 13:35:24 CET 2008 - schwab@suse.de
- Don't call sqlite3_finalize twice.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 13 21:09:52 CET 2008 - coolo@suse.de Sun Jan 13 21:09:52 CET 2008 - coolo@suse.de

View File

@@ -14,12 +14,13 @@ Name: perl-DBD-SQLite
BuildRequires: perl-DBI sqlite-devel BuildRequires: perl-DBI sqlite-devel
Summary: The DBD::SQLite is a self contained RDBMS in a DBI driver Summary: The DBD::SQLite is a self contained RDBMS in a DBI driver
Version: 1.14 Version: 1.14
Release: 1 Release: 11
License: Artistic License; GPL v2 or later License: Artistic License; GPL v2 or later
Group: Development/Libraries/Perl Group: Development/Libraries/Perl
Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz
Patch0: makefile-forgiving.diff Patch0: makefile-forgiving.diff
Patch1: dbimp-no_uninit.diff Patch1: dbimp-no_uninit.diff
Patch2: sqlite3-finalize.diff
Url: http://www.cpan.org Url: http://www.cpan.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: perl-DBI sqlite Requires: perl-DBI sqlite
@@ -49,6 +50,7 @@ Authors:
%setup -q -n DBD-SQLite-%{version} %setup -q -n DBD-SQLite-%{version}
#%patch -p1 #%patch -p1
%patch1 -p1 %patch1 -p1
%patch2
%build %build
perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS" perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS"
@@ -73,28 +75,30 @@ rm -rf $RPM_BUILD_ROOT
/var/adm/perl-modules/* /var/adm/perl-modules/*
%changelog %changelog
* Sun Jan 13 2008 - coolo@suse.de * Thu Feb 07 2008 schwab@suse.de
- Don't call sqlite3_finalize twice.
* Sun Jan 13 2008 coolo@suse.de
- update to 1.14 - update to 1.14
- disable test suite for now - disable test suite for now
* Fri Sep 08 2006 - jw@suse.de * Fri Sep 08 2006 jw@suse.de
- painless update to 1.13 - painless update to 1.13
* Mon May 29 2006 - jw@suse.de * Mon May 29 2006 jw@suse.de
- update to 1.12, to make it compile again. - update to 1.12, to make it compile again.
Using SQLite 3.3.5 and Perl 5.8.8 Using SQLite 3.3.5 and Perl 5.8.8
* Mon Mar 13 2006 - jw@suse.de * Mon Mar 13 2006 jw@suse.de
- fixed bugzilla#156965, unintialized variable. - fixed bugzilla#156965, unintialized variable.
* Wed Jan 25 2006 - mls@suse.de * Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires - converted neededforbuild to BuildRequires
* Sun Dec 04 2005 - jw@suse.de * Sun Dec 04 2005 jw@suse.de
- update to 1.11, feature++ - update to 1.11, feature++
* Fri Dec 02 2005 - jw@suse.de * Fri Dec 02 2005 jw@suse.de
- update to 1.10 - update to 1.10
be more forgiving to sqlite3.h, it is buggy again. be more forgiving to sqlite3.h, it is buggy again.
* Tue Oct 04 2005 - dmueller@suse.de * Tue Oct 04 2005 dmueller@suse.de
- add norootforbuild - add norootforbuild
* Thu Jun 30 2005 - schwab@suse.de * Thu Jun 30 2005 schwab@suse.de
- Fix neededforbuild. - Fix neededforbuild.
* Wed Jun 29 2005 - jw@suse.de * Wed Jun 29 2005 jw@suse.de
- initial version 1.09 - initial version 1.09
Since 1.09 it can link against a system provided sqlite library, Since 1.09 it can link against a system provided sqlite library,
but uses its own copy due to a buggy sqlite3.h but uses its own copy due to a buggy sqlite3.h

20
sqlite3-finalize.diff Normal file
View File

@@ -0,0 +1,20 @@
--- dbdimp.c
+++ dbdimp.c
@@ -399,7 +399,7 @@ sqlite_st_execute (SV *sth, imp_sth_t *i
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_st_execute (SV *sth, imp_sth_t *i
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;
}