OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 01-Aug-2004 20:18:29
Branch: HEAD Handle: 2004080119182800
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
modifying package: perl-dbi-5.8.5 20040723 -> 20040801
Summary:
Revision Changes Path
1.9 +36 -23 openpkg-src/perl-dbi/perl-dbi.patch
1.113 +2 -2 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.8 -r1.9 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 23 Jul 2004 10:06:55 -0000 1.8
+++ openpkg-src/perl-dbi/perl-dbi.patch 1 Aug 2004 18:18:28 -0000 1.9
@@ -1,18 +1,6 @@
-Index: dbdimp.h
---- dbdimp.h.orig 2004-07-21 22:50:42 +0200
-+++ dbdimp.h 2004-07-23 11:37:44 +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: MANIFEST
---- MANIFEST.orig 2004-07-21 22:48:03 +0200
-+++ MANIFEST 2004-07-23 11:42:58 +0200
+--- MANIFEST.orig 2004-07-21 22:50:42 +0200
++++ MANIFEST 2004-08-01 20:16:30 +0200
@@ -1,52 +1,14 @@
-attach.c
-auth.c
@@ -85,9 +73,9 @@
-vdbemem.c
-where.c
Index: Makefile.PL
---- Makefile.PL.orig 2004-07-21 22:44:54 +0200
-+++ Makefile.PL 2004-07-23 11:49:59 +0200
-@@ -5,29 +5,15 @@
+--- Makefile.PL.orig 2004-08-01 06:36:27 +0200
++++ Makefile.PL 2004-08-01 20:17:27 +0200
+@@ -5,34 +5,6 @@
use ExtUtils::MakeMaker;
use Config;
use strict;
@@ -95,10 +83,23 @@
- require DBD::SQLite;
- if ($DBD::SQLite::VERSION < 1.0) {
- print <<EOT;
+-
+-**** WARNING **** WARNING **** WARNING **** WARNING **** WARNING ****
+-
-Your version of DBD::SQLite currently installed ($DBD::SQLite::VERSION) uses
-the old sqlite database format. This version of DBD::SQLite will *NOT*
-open these files, and installing this module may cause problems on your
-system. If this is a live environment you should upgrade with caution.
+-
+-To upgrade a database, download and install both sqlite 2.x and 3.x from
+-http://www.sqlite.org/ and issue:
+-
+- sqlite OLD.DB .dump | sqlite3 NEW.DB
+-
+-DBD::SQLite will NOT automatically upgrade a database for you, and using
+-this version against an old SQLite database WILL lead to database
+-corruption.
+-
-EOT
- if (prompt("Continue?", "N") !~ /^y/i) {
- print "Exiting\n";
@@ -109,21 +110,21 @@
WriteMakefile(
'NAME' => 'DBD::SQLite',
- 'VERSION_FROM' => 'lib/DBD/SQLite.pm', # finds $VERSION
+@@ -40,7 +12,9 @@
'PREREQ_PM' => {DBI => 1.21}, # e.g., Module::Name => 1.1
'OBJECT' => '$(O_FILES)',
-- 'INC' => '-I$(DBI_INSTARCH_DIR)',
+ 'INC' => '-I$(DBI_INSTARCH_DIR)',
- 'OPTIMIZE' => "-O2 -DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}",
+ 'INC' => '[EMAIL PROTECTED]@/include -I$(DBI_INSTARCH_DIR)',
+ 'LIBS' => ['[EMAIL PROTECTED]@/lib -lsqlite3'],
+ 'OPTIMIZE' => "-O2",
'clean' => { FILES => 'SQLite.xsi config.h' },
+ 'PL_FILES' => {},
);
-
Index: dbdimp.c
---- dbdimp.c.orig 2004-07-21 22:50:42 +0200
-+++ dbdimp.c 2004-07-23 12:02:11 +0200
-@@ -224,7 +224,7 @@
+--- dbdimp.c.orig 2004-08-01 06:39:16 +0200
++++ dbdimp.c 2004-08-01 20:16:30 +0200
+@@ -249,7 +249,7 @@
return FALSE;
}
@@ -132,3 +133,15 @@
DBIc_NUM_FIELDS(imp_sth) = sqlite3_column_count(imp_sth->stmt);
DBIc_IMPSET_on(imp_sth);
+Index: dbdimp.h
+--- dbdimp.h.orig 2004-08-01 06:36:19 +0200
++++ dbdimp.h 2004-08-01 20:16:30 +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.112 -r1.113 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 23 Jul 2004 10:06:55 -0000 1.112
+++ openpkg-src/perl-dbi/perl-dbi.spec 1 Aug 2004 18:18:28 -0000 1.113
@@ -29,7 +29,7 @@
%define V_sql_statement 1.09
%define V_dbd_anydata 0.08
%define V_dbd_sprite 0.50
-%define V_dbd_sqlite 1.00
+%define V_dbd_sqlite 1.01
%define V_dbd_mysql 2.9004
%define V_dbd_pgsql 1.32
%define V_dbd_oracle 1.15
@@ -46,7 +46,7 @@
Group: Language
License: GPL/Artistic
Version: %{V_perl}
-Release: 20040723
+Release: 20040801
# package options
%option with_dbd_sqlite no
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
