Sfoglia il codice sorgente

modifying package: perl-dbi-5.10.0 20090406 -> 20090409

Ralf S. Engelschall 16 anni fa
parent
commit
2d85365249
2 ha cambiato i file con 21 aggiunte e 33 eliminazioni
  1. 19 31
      perl-dbi/perl-dbi.patch
  2. 2 2
      perl-dbi/perl-dbi.spec

+ 19 - 31
perl-dbi/perl-dbi.patch

@@ -1,7 +1,7 @@
-Index: DBD-SQLite-1.19_10/Makefile.PL
---- DBD-SQLite-1.19_10/Makefile.PL.orig	2009-04-05 21:35:21 +0200
-+++ DBD-SQLite-1.19_10/Makefile.PL	2009-04-06 22:28:29 +0200
-@@ -16,36 +16,6 @@
+Index: DBD-SQLite-1.22_02/Makefile.PL
+--- DBD-SQLite-1.22_02/Makefile.PL.orig	2009-04-08 13:42:58 +0200
++++ DBD-SQLite-1.22_02/Makefile.PL	2009-04-09 09:52:53 +0200
+@@ -16,46 +16,7 @@
  	return @_;
  }
  
@@ -35,10 +35,20 @@ Index: DBD-SQLite-1.19_10/Makefile.PL
 -	}
 -};
 -
+-# Because DBI generates a postamble at configure-time, we need
+-# the required version of DBI very early.
+ my $DBI_required = 1.57;
+-eval {
+-	require DBI;
+-};
+-if ( $@ or DBI->VERSION < $DBI_required ) {
+-	print "DBI 1.57 is required to configure this module, please install it or upgrade your CPAN/CPANPLUS shell\n";
+-	exit(0);
+-}
+ 
  # 2005/6/19, by rjray@blackperl.com
  #
- # Determine if we are going to use the provided SQLite code, or an already-
-@@ -143,24 +113,20 @@
+@@ -154,20 +115,17 @@
  # Prepare Compiler Options
  
  my @CC_LIBS = ();
@@ -65,31 +75,9 @@ Index: DBD-SQLite-1.19_10/Makefile.PL
  
  my @CC_DEFINE = (
  	'-DSQLITE_CORE',
--	'-DSQLITE_ENABLE_FTS3',
- 	'-DSQLITE_ENABLE_COLUMN_METADATA',
- 	'-DNDEBUG=1',
- 	"-DSQLITE_PTR_SZ=$Config{ptrsize}"
-@@ -193,8 +159,6 @@
- 	VERSION_FROM     => 'lib/DBD/SQLite.pm',
- 	PREREQ_PM        => {
- 		'DBI'              => '1.43',
--		'Test::More'       => '0.42',
--		'Test::NoWarnings' => '0.081',
- 	},
- 	OPTIONAL( '6.48',
- 		MIN_PERL_VERSION => '5.006',
-@@ -213,8 +177,6 @@
- 				'DBI'                 => '1.57',
- 			},
- 			build_requires => {
--				'Test::More'          => '0.42',
--				'Test::NoWarnings'    => '0.081',
- 			},
- 			resources => {
- 				license     => 'http://dev.perl.org/licenses/',
 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-06 22:25:14 +0200
++++ DBD-Sybase-1.09/dbdimp.c	2009-04-09 09:52:08 +0200
 @@ -774,22 +774,22 @@
  
  #if defined(CS_VERSION_150)
@@ -120,7 +108,7 @@ Index: DBD-Sybase-1.09/dbdimp.c
  	if (cs_config(context, CS_SET, CS_MESSAGE_CB,
 Index: DBD-cego/Makefile.PL
 --- DBD-cego/Makefile.PL.orig	2007-06-25 20:38:07 +0200
-+++ DBD-cego/Makefile.PL	2009-04-06 22:25:14 +0200
++++ DBD-cego/Makefile.PL	2009-04-09 09:52:08 +0200
 @@ -43,7 +43,7 @@
      'VERSION_FROM'  => 'Cego.pm',
      'PREREQ_PM'     => {DBI => 1.03},
@@ -132,7 +120,7 @@ Index: DBD-cego/Makefile.PL
  	      . $opt->{'prefix'} . "/lib/libBase.a",
 Index: DBD-mysql-4.010/dbdimp.h
 --- DBD-mysql-4.010/dbdimp.h.orig	2008-04-29 01:36:17 +0200
-+++ DBD-mysql-4.010/dbdimp.h	2009-04-06 22:25:14 +0200
++++ DBD-mysql-4.010/dbdimp.h	2009-04-09 09:52:08 +0200
 @@ -19,6 +19,7 @@
   *  Header files we use
   */

+ 2 - 2
perl-dbi/perl-dbi.spec

@@ -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.19_10
+%define       V_dbd_sqlite      1.22_02
 %define       V_dbd_mysql       4.010
 %define       V_dbd_pgsql       2.12.0
 %define       V_dbd_oracle      1.22
@@ -54,7 +54,7 @@ Class:        BASE
 Group:        Perl
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20090406
+Release:      20090409
 
 #   package options
 %option       with_sqlite       yes