SOURCES: ruby-DBI-prefix.patch - up for 0.1.0

[aredridel]

Author: aredridel                    Date: Wed Mar 15 01:01:29 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- up for 0.1.0

---- Files affected:
SOURCES:
   ruby-DBI-prefix.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/ruby-DBI-prefix.patch
diff -u SOURCES/ruby-DBI-prefix.patch:1.1 SOURCES/ruby-DBI-prefix.patch:1.2
--- SOURCES/ruby-DBI-prefix.patch:1.1	Sun Aug 22 06:07:44 2004
+++ SOURCES/ruby-DBI-prefix.patch	Wed Mar 15 02:01:24 2006
@@ -1,7 +1,24 @@
-diff -ur ruby-dbi-all-orig/setup.rb ruby-dbi-all/setup.rb
---- ruby-dbi-all-orig/setup.rb	2002-10-02 11:53:40.000000000 -0600
-+++ ruby-dbi-all/setup.rb	2004-02-22 17:08:18.523877588 -0700
-@@ -357,6 +357,9 @@
+diff -ur dbi-0.1.0-o/setup.rb dbi-0.1.0/setup.rb
+--- dbi-0.1.0-o/setup.rb	2006-02-13 06:35:18.000000000 -0700
++++ dbi-0.1.0/setup.rb	2006-03-14 17:57:57.000000000 -0700
+@@ -269,14 +269,14 @@
+ 						isdir( File.join( @config['rb-dir'], 'DBD', capname ) )
+ 						install(
+ 							basefile,
+-							File.join( @config['rb-dir'], 'DBD', capname, basefile ),
++							File.join( @config['prefix'], @config['rb-dir'], 'DBD', capname, basefile ),
+ 							0644
+ 						)
+ 					end
+ 				end
+ 			}
+ 			into_dir( 'dbi' ) { install_rb 'dbi' }
+-			install( 'dbi.rb', @config['rb-dir'], 0644 )
++			install( 'dbi.rb', File.join(@config['prefix'], @config['rb-dir']), 0644 )
+     }
+     into_dir( 'ext' ) {
+       foreach_package do |targ, *dummy|
+@@ -372,6 +372,9 @@
      'bin-dir'   => [ bindir,
                       'path',
                       'directory to install commands' ],
@@ -11,7 +28,7 @@
      'rb-dir'    => [ siterb,
                       'path',
                       'directory to install ruby scripts' ],
-@@ -384,7 +387,7 @@
+@@ -399,7 +402,7 @@
                       'package name(s) you do not want to install' ]
    }
  
@@ -20,7 +37,7 @@
  
    def save_configs
      File.open( ConfigFile, 'w' ) do |f|
-@@ -557,7 +560,7 @@
+@@ -573,7 +576,7 @@
        next if /\A\./ === fname
        next unless File.file? fname
  
@@ -29,16 +46,16 @@
      end
    end
  
-@@ -585,7 +588,7 @@
+@@ -601,7 +604,7 @@
    def install_so( dir )
-     to = isdir(File.expand_path @config['so-dir'] + '/' + dir)
+     to = isdir(File.expand_path(@config['so-dir'] + '/' + dir))
      find_so('.').each do |fn|
 -      install fn, to, 0555
 +      install fn, File.join(@config['prefix'], to), 0555
      end
    end
  
-@@ -642,7 +645,7 @@
+@@ -658,7 +661,7 @@
        dirs[0] = disk + dirs[0]
      end
      dirs.each_index do |idx|
@@ -47,4 +64,4 @@
        Dir.mkdir path unless dir? path
      end
    end
-Only in ruby-dbi-all: setup.rb~
+Only in dbi-0.1.0: setup.rb.orig
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/ruby-DBI-prefix.patch?r1=1.1&r2=1.2&f=u