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: 15-Apr-2007 10:51:21
Branch: HEAD Handle: 2007041509512000
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
add DBD::Cego support
Summary:
Revision Changes Path
1.27 +19 -5 openpkg-src/perl-dbi/perl-dbi.patch
1.230 +23 -1 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.26 -r1.27 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 23 Mar 2007 09:33:37 -0000
1.26
+++ openpkg-src/perl-dbi/perl-dbi.patch 15 Apr 2007 08:51:20 -0000
1.27
@@ -1,6 +1,6 @@
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 2007-01-08 19:32:01 +0100
++++ DBD-SQLite-1.13/Makefile.PL 2007-04-15 10:47:17 +0200
@@ -10,34 +10,6 @@
}
use Config;
@@ -63,7 +63,7 @@
( ($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 2007-01-08 19:32:01 +0100
++++ DBD-SQLite-1.13/dbdimp.c 2007-04-15 10:47:17 +0200
@@ -394,14 +394,17 @@
sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
@@ -85,7 +85,7 @@
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 2007-01-08 19:32:01 +0100
++++ DBD-SQLite-1.13/dbdimp.h 2007-04-15 10:47:17 +0200
@@ -4,7 +4,7 @@
#define _DBDIMP_H 1
@@ -95,9 +95,23 @@
/* 30 second timeout by default */
#define SQL_TIMEOUT 30000
+Index: DBD-cego/Makefile.PL
+--- DBD-cego/Makefile.PL.orig 2007-03-31 19:16:24 +0200
++++ DBD-cego/Makefile.PL 2007-04-15 10:48:31 +0200
+@@ -43,8 +43,8 @@
+ 'VERSION_FROM' => 'Cego.pm',
+ 'PREREQ_PM' => {DBI => 1.03},
+ 'OBJECT' => '$(O_FILES)',
+- 'INC' => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} .
'/include',
+- 'LDDLFLAGS' => '-bundle -undefined dynamic_lookup',
++ 'INC' => '-I$(DBI_INSTARCH_DIR) -I' . $opt->{'prefix'} .
'/include/cego',
++ 'LDDLFLAGS' => '',
+ 'MYEXTLIB' => $opt->{'prefix'} . "/lib/libCego.a "
+ . $opt->{'prefix'} . "/lib/libXML.a "
+ . $opt->{'prefix'} . "/lib/libBase.a",
Index: DBD-mysql-4.004/dbdimp.h
---- DBD-mysql-4.004/dbdimp.h.orig 2007-01-06 20:00:08 +0100
-+++ DBD-mysql-4.004/dbdimp.h 2007-01-08 19:32:01 +0100
+--- DBD-mysql-4.004/dbdimp.h.orig 2007-03-20 14:47:29 +0100
++++ DBD-mysql-4.004/dbdimp.h 2007-04-15 10:47:17 +0200
@@ -19,6 +19,7 @@
* Header files we use
*/
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.229 -r1.230 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 14 Apr 2007 08:03:47 -0000
1.229
+++ openpkg-src/perl-dbi/perl-dbi.spec 15 Apr 2007 08:51:20 -0000
1.230
@@ -41,6 +41,7 @@
%define V_dbd_sybase 1.07_09
%define V_dbd_odbc 1.13
%define V_dbd_pglite 0.09
+%define V_dbd_cego 1.0.2
# package information
Name: perl-dbi
@@ -53,7 +54,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20070414
+Release: 20070415
# package options
%option with_dbd_sqlite yes
@@ -62,6 +63,7 @@
%option with_dbd_oracle no
%option with_dbd_sybase no
%option with_dbd_odbc no
+%option with_dbd_cego no
# list of sources
Source0: http://www.cpan.org/modules/by-module/DBI/DBI-%{V_dbi}.tar.gz
@@ -81,6 +83,7 @@
Source14:
http://www.cpan.org/modules/by-module/DBD/DBD-ODBC-%{V_dbd_odbc}.tar.gz
Source15:
http://www.peppler.org/downloads/DBD-Sybase-%{V_dbd_sybase}.tar.gz
Source16:
http://www.cpan.org/modules/by-module/DBD/DBD-PgLite-%{V_dbd_pglite}.tar.gz
+Source17: http://www.lemke-it.com/DBD-cego-%{V_dbd_cego}.tar.gz
Patch0: perl-dbi.patch
# build information
@@ -114,6 +117,10 @@
BuildPreReq: ODBC
PreReq: ODBC
%endif
+%if "%{with_dbd_cego}" == "yes"
+BuildPreReq: cego
+PreReq: cego
+%endif
AutoReq: no
AutoReqProv: no
@@ -136,6 +143,7 @@
- DBD::Oracle (%{V_dbd_oracle}) [%{with_dbd_oracle}]
- DBD::Sybase (%{V_dbd_sybase}) [%{with_dbd_sybase}]
- DBD::ODBC (%{V_dbd_odbc}) [%{with_dbd_odbc}]
+ - DBD::Cego (%{V_dbd_cego}) [%{with_dbd_cego}]
%track
prog perl-dbi:DBI = {
@@ -225,6 +233,11 @@
url = http://www.peppler.org/downloads/
regex = DBD-Sybase-(__VER__)\.tar\.gz
}
+ prog perl-dbi:DBD-cego = {
+ version = %{V_dbd_cego}
+ url = http://www.lemke-it.com/opensource.html
+ regex = DBD-cego-(__VER__)\.tar\.gz
+ }
%prep
%setup -q -c
@@ -244,6 +257,7 @@
%setup -q -T -D -a 14
%setup -q -T -D -a 15
%setup -q -T -D -a 16
+ %setup -q -T -D -a 17
%patch -p0
%build
@@ -350,6 +364,14 @@
) || exit $?
%endif
+%if "%{with_dbd_cego}" == "yes"
+ # build DBD::Cego
+ ( cd DBD-cego
+ rm -f ._* >/dev/null 2>&1 || true
+ %{l_prefix}/bin/perl-openpkg --args=--prefix=%{l_prefix} configure
build install
+ ) || exit $?
+%endif
+
# determine installation files
%{l_prefix}/bin/perl-openpkg -F perl-openpkg-files fixate cleanup
%{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std} `cat
perl-openpkg-files`
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
