Просмотр исходного кода

modifying package: perl-dbi-5.8.7 20050618 -> 20050621

Ralf S. Engelschall 20 лет назад
Родитель
Сommit
055932120f
2 измененных файлов с 15 добавлено и 15 удалено
  1. 13 13
      perl-dbi/perl-dbi.patch
  2. 2 2
      perl-dbi/perl-dbi.spec

+ 13 - 13
perl-dbi/perl-dbi.patch

@@ -1,6 +1,6 @@
 Index: Makefile.PL
---- Makefile.PL.orig	2004-10-12 11:03:50 +0200
-+++ Makefile.PL	2004-10-13 19:23:27 +0200
+--- Makefile.PL.orig	2005-06-20 14:45:11 +0200
++++ Makefile.PL	2005-06-21 21:02:43 +0200
 @@ -7,34 +7,6 @@
  use ExtUtils::MakeMaker;
  use Config;
@@ -34,22 +34,22 @@ Index: Makefile.PL
 -    }
 -};
  
- my $nlid = $DBI::VERSION > 1.42 ? '' : '-Dno_last_insert_id';
- 
-@@ -43,8 +15,9 @@
+ # 2005/6/19, by rjray@blackperl.com
+ #
+@@ -113,8 +85,9 @@
      'VERSION_FROM'  => 'lib/DBD/SQLite.pm', # finds $VERSION
      'PREREQ_PM'     => {DBI => 1.21}, # e.g., Module::Name => 1.1
-     'OBJECT'        => '$(O_FILES)',
--    'INC'           => '-I. -I$(DBI_INSTARCH_DIR)',
-     'OPTIMIZE'      => "-O2",
-+    'INC'           => '-I@l_prefix@/include -I$(DBI_INSTARCH_DIR)',
+     'OBJECT'        => ($force_local) ? '$(O_FILES)' : 'SQLite.o dbdimp.o',
+-    'INC'           => '-I. -I$(DBI_INSTARCH_DIR)' .
++    'INC'           => '-I@l_prefix@/include -I$(DBI_INSTARCH_DIR)' .
+                        (($sqlite_inc) ? " -I$sqlite_inc" : ''),
 +    'LIBS'          => ['-L@l_prefix@/lib -lsqlite3'],
-     'DEFINE'        => "-DNDEBUG=1 -DSQLITE_PTR_SZ=$Config{ptrsize}" .
-                        ($Config{d_usleep} ? " -DHAVE_USLEEP=1" : "") .
-                        ($DBI::VERSION > 1.42 ? '' : ' -Dno_last_insert_id'),
+     $force_local ? () : ('LIBS' => '-lsqlite3'),
+     $sqlite_lib  ? ('dynamic_lib' => { OTHERLDFLAGS => "-L$sqlite_lib" }) : (),
+     'OPTIMIZE'      => "-O2",
 Index: dbdimp.h
 --- dbdimp.h.orig	2004-09-10 17:24:28 +0200
-+++ dbdimp.h	2004-09-24 10:44:37 +0200
++++ dbdimp.h	2005-06-21 21:01:54 +0200
 @@ -4,7 +4,7 @@
  #define _DBDIMP_H   1
  

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

@@ -30,7 +30,7 @@
 %define       V_sql_routine    0.65
 %define       V_dbd_anydata    0.08
 %define       V_dbd_sprite     0.56
-%define       V_dbd_sqlite     1.08
+%define       V_dbd_sqlite     1.09
 %define       V_dbd_mysql      2.9008
 %define       V_dbd_pgsql      1.42
 %define       V_dbd_oracle     1.16
@@ -48,7 +48,7 @@ Class:        BASE
 Group:        Language
 License:      GPL/Artistic
 Version:      %{V_perl}
-Release:      20050618
+Release:      20050621
 
 #   package options
 %option       with_dbd_sqlite  no