From 865adfb274b95cbe4c310ffde8cda71d77c4896c06f3ddc8d56b062a633e2e55 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Wed, 15 Apr 2009 22:54:48 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/perl-DBD-SQLite?expand=0&rev=6 --- DBD-SQLite-1.14.tar.gz | 3 --- DBD-SQLite-1.22_06.tar.bz2 | 3 +++ dbimp-no_uninit.diff | 17 ----------------- perl-DBD-SQLite.changes | 7 +++++++ perl-DBD-SQLite.spec | 22 +++++++++++++--------- sqlite3-finalize.diff | 20 -------------------- 6 files changed, 23 insertions(+), 49 deletions(-) delete mode 100644 DBD-SQLite-1.14.tar.gz create mode 100644 DBD-SQLite-1.22_06.tar.bz2 delete mode 100644 dbimp-no_uninit.diff delete mode 100644 sqlite3-finalize.diff diff --git a/DBD-SQLite-1.14.tar.gz b/DBD-SQLite-1.14.tar.gz deleted file mode 100644 index f3352bd..0000000 --- a/DBD-SQLite-1.14.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:44189d373a77eeb8a5353e0cd88bff04dde6e611678abdc6834c80d35d2f0d07 -size 703380 diff --git a/DBD-SQLite-1.22_06.tar.bz2 b/DBD-SQLite-1.22_06.tar.bz2 new file mode 100644 index 0000000..45687cf --- /dev/null +++ b/DBD-SQLite-1.22_06.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:4da3e886714176ce0cd596af60c3faf3686b14cc9fd05c1546fb4a8d7785ce2c +size 830437 diff --git a/dbimp-no_uninit.diff b/dbimp-no_uninit.diff deleted file mode 100644 index df9be19..0000000 --- a/dbimp-no_uninit.diff +++ /dev/null @@ -1,17 +0,0 @@ ---- DBD-SQLite-1.11/dbdimp.c.orig 2005-12-02 18:28:53.000000000 +0100 -+++ DBD-SQLite-1.11/dbdimp.c 2006-03-13 22:13:51.176441795 +0100 -@@ -246,12 +246,12 @@ - int retval; - - if (!DBIc_ACTIVE(imp_dbh)) { -- sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, "attempt to prepare on inactive database handle"); -+ sqlite_error(sth, (imp_xxh_t*)imp_sth, 0, "attempt to prepare on inactive database handle"); - return FALSE; - } - - if (strlen(statement) < 1) { -- sqlite_error(sth, (imp_xxh_t*)imp_sth, retval, "attempt to prepare empty statement"); -+ sqlite_error(sth, (imp_xxh_t*)imp_sth, 0, "attempt to prepare empty statement"); - return FALSE; - } - diff --git a/perl-DBD-SQLite.changes b/perl-DBD-SQLite.changes index d4a6465..2410782 100644 --- a/perl-DBD-SQLite.changes +++ b/perl-DBD-SQLite.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 15 18:22:54 CEST 2009 - jw@suse.de + +- updated to pristine 1.22_06 + *All* patches are upstreamed now. Yeah! + Using SQLite 3.6.13 now. + ------------------------------------------------------------------- Wed Jan 14 23:00:41 CET 2009 - jw@suse.de diff --git a/perl-DBD-SQLite.spec b/perl-DBD-SQLite.spec index bc79725..9e2b7d0 100644 --- a/perl-DBD-SQLite.spec +++ b/perl-DBD-SQLite.spec @@ -1,5 +1,5 @@ # -# spec file for package perl-DBD-SQLite (Version 1.14) +# spec file for package perl-DBD-SQLite (Version 1.22_06) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -21,13 +21,13 @@ Name: perl-DBD-SQLite BuildRequires: perl-DBI sqlite-devel Summary: The DBD::SQLite is a self contained RDBMS in a DBI driver -Version: 1.14 -Release: 71 +Version: 1.22_06 +Release: 1 License: Artistic License; GPL v2 or later Group: Development/Libraries/Perl -Source0: http://search.cpan.org/CPAN/authors/id/M/MS/MSERGEANT/DBD-SQLite-%{version}.tar.gz -Patch1: dbimp-no_uninit.diff -Patch2: sqlite3-finalize.diff +Source0: http://search.cpan.org/CPAN/authors/id/A/AD/ADAMK/DBD-SQLite-%{version}.tar.bz2 +# Patch1: dbimp-no_uninit.diff +# Patch2: sqlite3-finalize.diff Url: http://search.cpan.org/~msergeant/DBD-SQLite-1.14 BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: perl-DBI sqlite @@ -57,8 +57,8 @@ Authors: %prep %setup -q -n DBD-SQLite-%{version} -%patch1 -p1 -%patch2 +# %patch1 -p1 # upstreamed. +# %patch2 # upstreamed. %build perl Makefile.PL OPTIMIZE="$RPM_OPT_FLAGS" @@ -83,7 +83,11 @@ rm -rf $RPM_BUILD_ROOT /var/adm/perl-modules/* %changelog -* Wed Jan 14 2009 jw@suse.de +* Wed Apr 15 2009 jw@suse.de +- updated to pristine 1.22_06 + *All* patches are upstreamed now. Yeah! + Using SQLite 3.6.13 now. +* Thu Jan 15 2009 jw@suse.de - bnc#466021 fixed. * Thu Feb 07 2008 schwab@suse.de - Don't call sqlite3_finalize twice. diff --git a/sqlite3-finalize.diff b/sqlite3-finalize.diff deleted file mode 100644 index bfa77e9..0000000 --- a/sqlite3-finalize.diff +++ /dev/null @@ -1,20 +0,0 @@ ---- 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; - }