OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: r...@openpkg.org
Module: openpkg-src Date: 12-Aug-2009 12:43:32
Branch: HEAD Handle: 2009081211433200
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
modifying package: perl-dbi-5.10.0 20090807 -> 20090812
Summary:
Revision Changes Path
1.64 +14 -17 openpkg-src/perl-dbi/perl-dbi.patch
1.366 +2 -2 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.63 -r1.64 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 19 Jun 2009 19:27:29 -0000
1.63
+++ openpkg-src/perl-dbi/perl-dbi.patch 12 Aug 2009 10:43:32 -0000
1.64
@@ -1,6 +1,6 @@
-Index: DBD-SQLite-1.26_02/Makefile.PL
---- DBD-SQLite-1.26_02/Makefile.PL.orig 2009-04-14 17:43:16 +0200
-+++ DBD-SQLite-1.26_02/Makefile.PL 2009-04-15 18:18:30 +0200
+Index: DBD-SQLite-1.26_03/Makefile.PL
+--- DBD-SQLite-1.26_03/Makefile.PL.orig 2009-08-12 07:53:19 +0200
++++ DBD-SQLite-1.26_03/Makefile.PL 2009-08-12 12:40:10 +0200
@@ -17,46 +17,7 @@
return @_;
}
@@ -46,16 +46,16 @@
- exit(0);
-}
- # 2005/6/19, by rj...@blackperl.com
- #
-@@ -154,20 +115,17 @@
+ # Determine if we are going to use the provided SQLite code, or an already-
+ # installed copy. To this end, look for two command-line parameters:
+@@ -148,17 +109,17 @@
# Prepare Compiler Options
my @CC_LIBS = ();
-if ( $sqlite_lib ) {
- push @CC_LIBS, "-L$sqlite_lib";
-}
--unless ( $force_local ) {
+-unless ( $sqlite_local ) {
- push @CC_LIBS, '-lsqlite3';
-}
+my $libs = `...@l_prefix@/bin/pkg-config sqlite3 --libs`;
@@ -68,16 +68,13 @@
'-I.',
'-I$(DBI_INSTARCH_DIR)',
);
--if ( $sqlite_inc ) {
-- push @CC_INC, "-I$sqlite_inc";
--}
+unshift @INC, $inc;
-
- my @CC_DEFINE = (
- '-DSQLITE_CORE',
+ if ( $sqlite_inc ) {
+ push @CC_INC, "-I$sqlite_inc";
+ }
Index: DBD-Sybase-1.09/dbdimp.c
--- DBD-Sybase-1.09/dbdimp.c.orig 2008-08-31 14:08:17 +0200
-+++ DBD-Sybase-1.09/dbdimp.c 2009-04-15 18:18:30 +0200
++++ DBD-Sybase-1.09/dbdimp.c 2009-08-12 12:39:07 +0200
@@ -774,22 +774,22 @@
#if defined(CS_VERSION_150)
@@ -108,7 +105,7 @@
if (cs_config(context, CS_SET, CS_MESSAGE_CB,
Index: DBD-cego/Makefile.PL
--- DBD-cego/Makefile.PL.orig 2009-04-09 17:37:51 +0200
-+++ DBD-cego/Makefile.PL 2009-04-15 18:18:55 +0200
++++ DBD-cego/Makefile.PL 2009-08-12 12:39:07 +0200
@@ -43,7 +43,7 @@
'VERSION_FROM' => 'Cego.pm',
'PREREQ_PM' => {DBI => 1.03},
@@ -119,8 +116,8 @@
. $opt->{'prefix'} . "/lib/libXML.a "
. $opt->{'prefix'} . "/lib/libBase.a",
Index: DBD-mysql-4.012/dbdimp.h
---- DBD-mysql-4.012/dbdimp.h.orig 2009-04-13 14:10:40 +0200
-+++ DBD-mysql-4.012/dbdimp.h 2009-04-15 18:18:30 +0200
+--- DBD-mysql-4.012/dbdimp.h.orig 2009-06-19 03:54:47 +0200
++++ DBD-mysql-4.012/dbdimp.h 2009-08-12 12:39:07 +0200
@@ -19,6 +19,7 @@
* Header files we use
*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.365 -r1.366 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 7 Aug 2009 17:19:59 -0000
1.365
+++ openpkg-src/perl-dbi/perl-dbi.spec 12 Aug 2009 10:43:32 -0000
1.366
@@ -34,7 +34,7 @@
%define V_dbd_anydata 0.09
%define V_dbd_csv 0.22
%define V_dbd_sprite 0.59
-%define V_dbd_sqlite 1.26_02
+%define V_dbd_sqlite 1.26_03
%define V_dbd_mysql 4.012
%define V_dbd_pgsql 2.15.1
%define V_dbd_oracle 1.23
@@ -54,7 +54,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20090807
+Release: 20090812
# package options
%option with_sqlite yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
