add packaging

diff --git a/packaging/ruby-1.9.2p290_tcl_no_stupid_rpaths.patch b/packaging/ruby-1.9.2p290_tcl_no_stupid_rpaths.patch
deleted file mode 100644 (file)
index baa2c3e..0000000
--- a/packaging/ruby-1.9.2p290_tcl_no_stupid_rpaths.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: ext/tk/extconf.rb
-===================================================================
---- ext/tk/extconf.rb.orig
-+++ ext/tk/extconf.rb
-@@ -215,9 +215,7 @@ def get_shlib_path_head
- 
-   else
-     [
--      '/opt', '/pkg', '/share',
--      '/usr/local/opt', '/usr/local/pkg', '/usr/local/share', '/usr/local',
--      '/usr/opt', '/usr/pkg', '/usr/share', '/usr/contrib', '/usr'
-+      '/usr'
-     ].each{|dir|
-       next unless File.directory?(dir)
- 

diff --git a/packaging/ruby.spec b/packaging/ruby.spec
index 3605e31..281b1f7 100644 (file)
--- a/packaging/ruby.spec
+++ b/packaging/ruby.spec
@@ -38,9 +38,6 @@ Url:            http://www.ruby-lang.org/
 Source:         ftp://ftp.ruby-lang.org/pub/ruby/1.9/ruby-%{pkg_version}-%{patch_level}.tar.bz2
 Source6:        ruby19.macros
 Source7:        gem_install_wrapper.sh
-Patch:          rubygems-1.5.0_buildroot.patch
-Patch1:         ruby-1.9.2p290_tcl_no_stupid_rpaths.patch
-Patch2:         ruby19-export_init_prelude.patch
 #
 Summary:        An Interpreted Object-Oriented Scripting Language
 License:        BSD-2-Clause or Ruby
@@ -154,9 +151,7 @@ BeOS, and more)
 
 %prep
 %setup -q -n ruby-%{pkg_version}-%{patch_level}
-%patch
-%patch1
-%patch2 -p1
+
 %if 0%{?needs_optimization_zero}
 touch -r configure configure.timestamp
 perl -p -i.bak -e 's|-O2|-O0|g' configure

diff --git a/packaging/ruby19-export_init_prelude.patch b/packaging/ruby19-export_init_prelude.patch
deleted file mode 100644 (file)
index 34215de..0000000
--- a/packaging/ruby19-export_init_prelude.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Index: ruby-1.9.3-p194/include/ruby/ruby.h
-===================================================================
---- ruby-1.9.3-p194.orig/include/ruby/ruby.h
-+++ ruby-1.9.3-p194/include/ruby/ruby.h
-@@ -1225,6 +1225,7 @@ void ruby_init_stack(volatile VALUE*);
-     VALUE variable_in_this_stack_frame; \
-     ruby_init_stack(&variable_in_this_stack_frame);
- void ruby_init(void);
-+void ruby_init_prelude(void);
- void *ruby_options(int, char**);
- int ruby_run_node(void *);
- int ruby_exec_node(void *);
-Index: ruby-1.9.3-p194/ruby.c
-===================================================================
---- ruby-1.9.3-p194.orig/ruby.c
-+++ ruby-1.9.3-p194/ruby.c
-@@ -1091,7 +1091,7 @@ proc_options(long argc, char **argv, str
-     return argc0 - argc;
- }
- 
--static void
-+void
- ruby_init_prelude(void)
- {
-     Init_prelude();

diff --git a/packaging/rubygems-1.5.0_buildroot.patch b/packaging/rubygems-1.5.0_buildroot.patch
deleted file mode 100644 (file)
index 7e4f09f..0000000
--- a/packaging/rubygems-1.5.0_buildroot.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-Index: lib/rubygems/dependency_installer.rb
-===================================================================
---- lib/rubygems/dependency_installer.rb.orig
-+++ lib/rubygems/dependency_installer.rb
-@@ -69,6 +69,7 @@ class Gem::DependencyInstaller
-     @installed_gems = []
- 
-     @install_dir = options[:install_dir] || Gem.dir
-+    @build_root = options[:build_root]
-     @cache_dir = options[:cache_dir] || @install_dir
- 
-     # Set with any errors that SpecFetcher finds while search through
-@@ -290,6 +291,7 @@ class Gem::DependencyInstaller
-                                 :format_executable   => @format_executable,
-                                 :ignore_dependencies => @ignore_dependencies,
-                                 :install_dir         => @install_dir,
-+                                :build_root          => @build_root,
-                                 :security_policy     => @security_policy,
-                                 :user_install        => @user_install,
-                                 :wrappers            => @wrappers
-Index: lib/rubygems/installer.rb
-===================================================================
---- lib/rubygems/installer.rb.orig
-+++ lib/rubygems/installer.rb
-@@ -427,9 +427,18 @@ class Gem::Installer
-     @wrappers            = options[:wrappers]
-     @bin_dir             = options[:bin_dir]
-     @development         = options[:development]
-+    @build_root          = options[:build_root]
- 
-     raise "NOTE: Installer option :source_index is dead" if
-       options[:source_index]
-+
-+    unless @build_root.nil?
-+      require 'pathname'
-+      @build_root = Pathname.new(@build_root).expand_path
-+      @bin_dir = File.join(@build_root, options[:bin_dir] || Gem.bindir(@gem_home))
-+      @gem_home = File.join(@build_root,@gem_home)
-+      alert_warning "You build with buildroot.\n  Build root: #{@build_root}\n  Bin dir: #{@bin_dir}\n  Gem home: #{@gem_home}"
-+    end
-   end
- 
-   def check_that_user_bin_dir_is_in_path
-Index: lib/rubygems/install_update_options.rb
-===================================================================
---- lib/rubygems/install_update_options.rb.orig
-+++ lib/rubygems/install_update_options.rb
-@@ -44,6 +44,12 @@ module Gem::InstallUpdateOptions
-       options[:bin_dir] = File.expand_path(value)
-     end
- 
-+    add_option(:"Install/Update", '--build-root DIR',
-+      'Temporary installation root. Useful for building',
-+      'packages. Do not use this when installing remote gems.') do |value, options|
-+      options[:build_root] = File.expand_path(value)
-+    end
-+
-     add_option(:"Install/Update", '-d', '--[no-]rdoc',
-                'Generate RDoc documentation for the gem on',
-                'install') do |value, options|