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: 21-Oct-2007 21:59:16
Branch: HEAD Handle: 2007102120591500
Modified files:
openpkg-src/perl-dbi perl-dbi.patch perl-dbi.spec
Log:
add SQL::Translator
Summary:
Revision Changes Path
1.32 +92 -5 openpkg-src/perl-dbi/perl-dbi.patch
1.247 +36 -25 openpkg-src/perl-dbi/perl-dbi.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.patch
============================================================================
$ cvs diff -u -r1.31 -r1.32 perl-dbi.patch
--- openpkg-src/perl-dbi/perl-dbi.patch 20 Sep 2007 08:17:30 -0000
1.31
+++ openpkg-src/perl-dbi/perl-dbi.patch 21 Oct 2007 19:59:15 -0000
1.32
@@ -1,6 +1,6 @@
Index: DBD-SQLite-1.14/Makefile.PL
--- DBD-SQLite-1.14/Makefile.PL.orig 2007-08-28 21:57:09 +0200
-+++ DBD-SQLite-1.14/Makefile.PL 2007-09-20 09:40:47 +0200
++++ DBD-SQLite-1.14/Makefile.PL 2007-10-21 21:55:59 +0200
@@ -10,34 +10,6 @@
}
use Config;
@@ -63,7 +63,7 @@
( ($Config{d_usleep} ||
Index: DBD-SQLite-1.14/dbdimp.c
--- DBD-SQLite-1.14/dbdimp.c.orig 2007-08-24 04:51:25 +0200
-+++ DBD-SQLite-1.14/dbdimp.c 2007-09-20 09:42:02 +0200
++++ DBD-SQLite-1.14/dbdimp.c 2007-10-21 21:55:59 +0200
@@ -394,15 +394,18 @@
sqlite_trace(3, "Execute returned %d cols\n", DBIc_NUM_FIELDS(imp_sth));
@@ -86,7 +86,7 @@
imp_sth->nrow = sqlite3_changes(imp_dbh->db);
Index: DBD-SQLite-1.14/dbdimp.h
--- DBD-SQLite-1.14/dbdimp.h.orig 2007-08-23 02:45:08 +0200
-+++ DBD-SQLite-1.14/dbdimp.h 2007-09-20 09:42:28 +0200
++++ DBD-SQLite-1.14/dbdimp.h 2007-10-21 21:55:59 +0200
@@ -4,7 +4,7 @@
#define _DBDIMP_H 1
@@ -98,7 +98,7 @@
#define SQL_TIMEOUT 30000
Index: DBD-cego/Makefile.PL
--- DBD-cego/Makefile.PL.orig 2007-06-25 20:38:07 +0200
-+++ DBD-cego/Makefile.PL 2007-06-26 21:07:10 +0200
++++ DBD-cego/Makefile.PL 2007-10-21 21:55:59 +0200
@@ -43,7 +43,7 @@
'VERSION_FROM' => 'Cego.pm',
'PREREQ_PM' => {DBI => 1.03},
@@ -110,7 +110,7 @@
. $opt->{'prefix'} . "/lib/libBase.a",
Index: DBD-mysql-4.005/dbdimp.h
--- DBD-mysql-4.005/dbdimp.h.orig 2007-06-07 13:51:16 +0200
-+++ DBD-mysql-4.005/dbdimp.h 2007-06-26 21:06:20 +0200
++++ DBD-mysql-4.005/dbdimp.h 2007-10-21 21:55:59 +0200
@@ -19,6 +19,7 @@
* Header files we use
*/
@@ -119,3 +119,90 @@
#include <mysql.h> /* Comes with MySQL-devel */
#include <mysqld_error.h> /* Comes MySQL */
#include <errmsg.h> /* Comes with MySQL-devel */
+Index: DBI-1.59/Makefile.PL
+--- DBI-1.59/Makefile.PL.orig 2007-06-28 15:12:27 +0200
++++ DBI-1.59/Makefile.PL 2007-10-21 21:55:59 +0200
+@@ -343,3 +343,4 @@
+ }
+
+ # end.
++
+Index: SQL-Translator-0.0899_01/Build.PL
+--- SQL-Translator-0.0899_01/Build.PL.orig 2007-10-21 14:43:48 +0200
++++ SQL-Translator-0.0899_01/Build.PL 2007-10-21 21:56:21 +0200
+@@ -25,7 +25,6 @@
+ 'Class::Data::Inheritable' => 0.02,
+ 'Class::MakeMethods' => 0,
+ 'IO::Dir' => 0,
+- 'Log::Log4perl' => 0,
+ 'Parse::RecDescent' => 1.94,
+ 'Pod::Usage' => 0,
+ },
+@@ -43,12 +42,6 @@
+ 'XML::XPath' => 1.13,
+ },
+ build_requires => {
+- 'File::Basename' => 0,
+- 'File::Spec' => 0,
+- 'Test::More' => 0.6,
+- 'Test::Exception' => 0,
+- 'Test::Differences' => 0,
+- 'YAML' => 0.39,
+ },
+ get_options => {
+ # Where to store additional files such as templates.
+Index: SQL-Translator-0.0899_01/lib/SQL/Translator/Schema/Graph.pm
+--- SQL-Translator-0.0899_01/lib/SQL/Translator/Schema/Graph.pm.orig
2007-10-21 14:43:48 +0200
++++ SQL-Translator-0.0899_01/lib/SQL/Translator/Schema/Graph.pm
2007-10-21 21:55:59 +0200
+@@ -5,8 +5,6 @@
+ use Data::Dumper;
+ local $Data::Dumper::Maxdepth = 3;
+
+-use Log::Log4perl qw(:easy);
+-Log::Log4perl->easy_init($ERROR);
+ use SQL::Translator::Schema::Graph::Node;
+ use SQL::Translator::Schema::Graph::Edge;
+ use SQL::Translator::Schema::Graph::Port;
+@@ -173,7 +171,6 @@
+ }
+
+ my $graph = $self; #hack
+- my $log = Log::Log4perl->get_logger('SQL.Translator.Schema.Graph');
+
+ #
+ # create methods
+@@ -208,8 +205,6 @@
+ $hyperedge->push_thatfield($edge->thisfield);
+ $hyperedge->push_thatviafield($edge->thatfield);
+ }
+- $log->debug($edge->thisfield->name);
+- $log->debug($edge->thatfield->name);
+ }
+
+ if ($hyperedge->count_thisnode == 1 and $hyperedge->count_thatnode ==
1) {
+@@ -222,25 +217,11 @@
+ $hyperedge->type('many2many');
+ }
+
+- $log->debug($_) foreach sort keys
%::SQL::Translator::Schema::Graph::HyperEdge::;
+-
+ #node_to won't always be defined b/c of multiple edges to a single
other node
+ if (defined($node_to)) {
+- $log->debug($node_from->name);
+- $log->debug($node_to->name);
+-
+ if (scalar($hyperedge->thisnode) > 1) {
+- $log->debug($hyperedge->type ." via ". $hyperedge->vianode->name);
+ my $i = 0;
+ foreach my $thisnode ( $hyperedge->thisnode ) {
+- $log->debug($thisnode->name .' '.
+- $hyperedge->thisfield_index(0)->name .' -> '.
+- $hyperedge->thisviafield_index($i)->name .' '.
+- $hyperedge->vianode->name .' '.
+- $hyperedge->thatviafield_index(0)->name .' <- '.
+- $hyperedge->thatfield_index(0)->name .' '.
+- $hyperedge->thatnode_index(0)->name ."\n"
+- );
+ $i++;
+ }
+ }
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/perl-dbi/perl-dbi.spec
============================================================================
$ cvs diff -u -r1.246 -r1.247 perl-dbi.spec
--- openpkg-src/perl-dbi/perl-dbi.spec 20 Oct 2007 15:06:45 -0000
1.246
+++ openpkg-src/perl-dbi/perl-dbi.spec 21 Oct 2007 19:59:15 -0000
1.247
@@ -30,6 +30,7 @@
%define V_sql_routine 0.70.3
%define V_sql_builder 0.033
%define V_sql_interpolate 0.33
+%define V_sql_translator 0.0899_01
%define V_dbd_mock 1.36
%define V_dbd_anydata 0.09
%define V_dbd_csv 0.22
@@ -54,7 +55,7 @@
Group: Perl
License: GPL/Artistic
Version: %{V_perl}
-Release: 20071020
+Release: 20071021
# package options
%option with_dbd_sqlite yes
@@ -72,18 +73,19 @@
Source3:
http://www.darrenduncan.net/d/perl/archives/SQL-Routine-v%{V_sql_routine}.tar.gz
Source4:
ftp://ftp.openpkg.org/sources/CPY/ORPHANED/perl/SQL-Builder-%{V_sql_builder}.tar.gz
Source5:
http://www.cpan.org/modules/by-module/SQL/SQL-Interpolate-%{V_sql_interpolate}.tar.gz
-Source6:
http://www.cpan.org/modules/by-module/DBD/DBD-Mock-%{V_dbd_mock}.tar.gz
-Source7:
http://www.cpan.org/modules/by-module/DBD/DBD-AnyData-%{V_dbd_anydata}.tar.gz
-Source8:
http://www.cpan.org/modules/by-module/DBD/DBD-CSV-%{V_dbd_csv}.tar.gz
-Source9:
http://www.cpan.org/modules/by-module/DBD/DBD-Sprite-%{V_dbd_sprite}.tar.gz
-Source10:
http://www.cpan.org/modules/by-module/DBD/DBD-SQLite-%{V_dbd_sqlite}.tar.gz
-Source11:
http://www.cpan.org/modules/by-module/DBD/DBD-mysql-%{V_dbd_mysql}.tar.gz
-Source12:
http://www.cpan.org/modules/by-module/DBD/DBD-Pg-%{V_dbd_pgsql}.tar.gz
-Source13:
http://www.cpan.org/modules/by-module/DBD/DBD-Oracle-%{V_dbd_oracle}.tar.gz
-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
+Source6:
http://www.cpan.org/authors/id/J/JR/JROBINSON/SQL-Translator-%{V_sql_translator}.tar.gz
+Source7:
http://www.cpan.org/modules/by-module/DBD/DBD-Mock-%{V_dbd_mock}.tar.gz
+Source8:
http://www.cpan.org/modules/by-module/DBD/DBD-AnyData-%{V_dbd_anydata}.tar.gz
+Source9:
http://www.cpan.org/modules/by-module/DBD/DBD-CSV-%{V_dbd_csv}.tar.gz
+Source10:
http://www.cpan.org/modules/by-module/DBD/DBD-Sprite-%{V_dbd_sprite}.tar.gz
+Source11:
http://www.cpan.org/modules/by-module/DBD/DBD-SQLite-%{V_dbd_sqlite}.tar.gz
+Source12:
http://www.cpan.org/modules/by-module/DBD/DBD-mysql-%{V_dbd_mysql}.tar.gz
+Source13:
http://www.cpan.org/modules/by-module/DBD/DBD-Pg-%{V_dbd_pgsql}.tar.gz
+Source14:
http://www.cpan.org/modules/by-module/DBD/DBD-Oracle-%{V_dbd_oracle}.tar.gz
+Source15:
http://www.cpan.org/modules/by-module/DBD/DBD-ODBC-%{V_dbd_odbc}.tar.gz
+Source16:
http://www.peppler.org/downloads/DBD-Sybase-%{V_dbd_sybase}.tar.gz
+Source17:
http://www.cpan.org/modules/by-module/DBD/DBD-PgLite-%{V_dbd_pglite}.tar.gz
+Source18: http://www.lemke-it.com/DBD-cego-%{V_dbd_cego}.tar.gz
Patch0: perl-dbi.patch
# build information
@@ -91,8 +93,8 @@
BuildRoot: %{l_buildroot}
BuildPreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}, perl-openpkg
>= %{V_perl}-20040126, pkgconfig
PreReq: OpenPKG, openpkg >= 20040130, perl >= %{V_perl}
-BuildPreReq: perl-module, perl-util, perl-net, perl-locale, perl-text
-PreReq: perl-module, perl-util, perl-net, perl-locale, perl-text
+BuildPreReq: perl-module, perl-util, perl-net, perl-locale, perl-text,
perl-parse
+PreReq: perl-module, perl-util, perl-net, perl-locale, perl-text,
perl-parse
%if "%{with_dbd_sqlite}" == "yes"
BuildPreReq: sqlite, perl-locale >= %{V_perl}-20060921
PreReq: sqlite, perl-locale >= %{V_perl}-20060921
@@ -132,6 +134,7 @@
- SQL::Routine (%{V_sql_routine})
- SQL::Builder (%{V_sql_builder})
- SQL::Interpolate (%{V_sql_interpolate})
+ - SQL::Translator (%{V_sql_translator})
- DBD::Mock (%{V_dbd_mock})
- DBD::AnyData (%{V_dbd_anydata})
- DBD::CSV (%{V_dbd_csv})
@@ -178,6 +181,11 @@
url = http://www.cpan.org/modules/by-module/SQL/
regex = SQL-Interpolate-(__VER__)\.tar\.gz
}
+ prog perl-dbi:SQL-Translator = {
+ version = %{V_sql_translator}
+ url = http://www.cpan.org/authors/id/J/JR/JROBINSON/
+ regex = SQL-Translator-(__VER__)\.tar\.gz
+ }
prog perl-dbi:DBD-Mock = {
version = %{V_dbd_mock}
url = http://www.cpan.org/modules/by-module/DBD/
@@ -258,7 +266,9 @@
%setup -q -T -D -a 15
%setup -q -T -D -a 16
%setup -q -T -D -a 17
+ %setup -q -T -D -a 18
%patch -p0
+ chmod u+w SQL-Translator-*/*
%build
@@ -267,16 +277,17 @@
%{l_prefix}/bin/perl-openpkg prepare
# build and install individual modules
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE1} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE2} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE3} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE4} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE5} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE6} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE7} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE8} configure build install
- %{l_prefix}/bin/perl-openpkg -d %{SOURCE9} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE0} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE1} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE2} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE3} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE4} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE5} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE6} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE7} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE8} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE9} configure build install
+ %{l_prefix}/bin/perl-openpkg -d %{SOURCE10} configure build install
%if "%{with_dbd_sqlite}" == "yes"
# build DBD::SQLite
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List openpkg-cvs@openpkg.org
