OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 08-Sep-2006 17:29:50
Branch: HEAD Handle: 2006090816294900
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
modifying package: perl-dbi-5.8.8 20060809 -> 20060908
Summary:
Revision Changes Path
1.20 +27 -26 openpkg-src/perl-dbi/perl-dbi.patch
1.208 +2 -2 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.19 -r1.20 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 24 Jul 2006 11:06:09 -0000
1.19
+++ openpkg-src/perl-dbi/perl-dbi.patch 8 Sep 2006 15:29:49 -0000
1.20
@@ -1,8 +1,8 @@
-Index: DBD-SQLite-1.12/Makefile.PL
---- DBD-SQLite-1.12/Makefile.PL.orig 2005-06-20 14:45:11 +0200
-+++ DBD-SQLite-1.12/Makefile.PL 2005-06-21 21:02:43 +0200
-@@ -7,34 +7,6 @@
- use ExtUtils::MakeMaker;
+Index: DBD-SQLite-1.13/Makefile.PL
+--- DBD-SQLite-1.13/Makefile.PL.orig 2006-09-08 05:45:13 +0200
++++ DBD-SQLite-1.13/Makefile.PL 2006-09-08 17:28:16 +0200
+@@ -10,34 +10,6 @@
+ }
use Config;
use strict;
-eval {
@@ -36,33 +36,22 @@
# 2005/6/19, by [EMAIL PROTECTED]
#
-@@ -113,8 +85,9 @@
+@@ -120,9 +92,9 @@
'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
'OBJECT' => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
- 'INC' => '-I. -I$(DBI_INSTARCH_DIR)' .
-+ 'INC' => '[EMAIL PROTECTED]@/include -I$(DBI_INSTARCH_DIR)' .
++ 'INC' => '[EMAIL PROTECTED]@/include -I.
-I$(DBI_INSTARCH_DIR)' .
(($sqlite_inc) ? " -I$sqlite_inc" : ''),
+- $libs ? ('LIBS' => $libs) : (),
+ 'LIBS' => ['[EMAIL PROTECTED]@/lib -lsqlite3'],
- $force_local ? () : ('LIBS' => '-lsqlite3'),
- $sqlite_lib ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) :
(),
'OPTIMIZE' => "-O2",
-Index: DBD-SQLite-1.12/dbdimp.h
---- DBD-SQLite-1.12/dbdimp.h.orig 2004-09-10 17:24:28 +0200
-+++ DBD-SQLite-1.12/dbdimp.h 2005-06-21 21:01:54 +0200
-@@ -4,7 +4,7 @@
- #define _DBDIMP_H 1
-
- #include "SQLiteXS.h"
--#include "sqliteInt.h"
-+#include "sqlite3.h"
-
- /* 30 second timeout by default */
- #define SQL_TIMEOUT 30000
-Index: DBD-SQLite-1.12/dbdimp.c
---- DBD-SQLite-1.12/dbdimp.c.orig 2006-04-10 03:50:05 +0200
-+++ DBD-SQLite-1.12/dbdimp.c 2006-07-24 13:01:30 +0200
-@@ -390,14 +390,17 @@
+ 'DEFINE' => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
+ ( ($Config{d_usleep} ||
+Index: DBD-SQLite-1.13/dbdimp.c
+--- DBD-SQLite-1.13/dbdimp.c.orig 2006-09-08 06:50:50 +0200
++++ DBD-SQLite-1.13/dbdimp.c 2006-09-08 17:27:14 +0200
+@@ -394,14 +394,17 @@
sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
if (DBIc_NUM_FIELDS(imp_sth) == 0) {
@@ -79,5 +68,17 @@
}
+ free(defererr);
/* warn("Finalize\n"); */
- sqlite3_finalize(imp_sth->stmt);
+ sqlite3_reset(imp_sth->stmt);
imp_sth->nrow = sqlite3_changes(imp_dbh->db);
+Index: DBD-SQLite-1.13/dbdimp.h
+--- DBD-SQLite-1.13/dbdimp.h.orig 2006-09-08 06:50:50 +0200
++++ DBD-SQLite-1.13/dbdimp.h 2006-09-08 17:27:14 +0200
+@@ -4,7 +4,7 @@
+ #define _DBDIMP_H 1
+
+ #include "SQLiteXS.h"
+-#include "sqliteInt.h"
++#include "sqlite3.h"
+
+ /* 30 second timeout by default */
+ #define SQL_TIMEOUT 30000
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.207 -r1.208 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 9 Aug 2006 07:08:24 -0000
1.207
+++ openpkg-src/perl-dbi/perl-dbi.spec 8 Sep 2006 15:29:49 -0000
1.208
@@ -34,7 +34,7 @@
%define V_dbd_anydata 0.08
%define V_dbd_csv 0.22
%define V_dbd_sprite 0.58
-%define V_dbd_sqlite 1.12
+%define V_dbd_sqlite 1.13
%define V_dbd_mysql 3.0006
%define V_dbd_pgsql 1.49
%define V_dbd_oracle 1.18a
@@ -52,7 +52,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20060809
+Release: 20060908
# package options
%option with_dbd_sqlite yes
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
