Author: aredridel Date: Sun Aug 9 21:32:35 2009 GMT Module: packages Tag: HEAD ---- Log message: - add de-gemming patch
---- Files affected: packages/ruby-treetop: ruby-treetop.spec (1.1 -> 1.2) , ruby-treetop-gems.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/ruby-treetop/ruby-treetop.spec diff -u packages/ruby-treetop/ruby-treetop.spec:1.1 packages/ruby-treetop/ruby-treetop.spec:1.2 --- packages/ruby-treetop/ruby-treetop.spec:1.1 Sun Aug 9 23:27:12 2009 +++ packages/ruby-treetop/ruby-treetop.spec Sun Aug 9 23:32:30 2009 @@ -7,6 +7,7 @@ Group: Development/Languages Source0: http://gems.rubyforge.org/gems/treetop-1.3.0.gem # Source0-md5: a1fbf9629f8052eeff592d437c8b47a6 +Patch0: %{name}-gems.patch URL: http://treetop.rubyforge.org BuildRequires: rake BuildRequires: rpmbuild(macros) >= 1.277 @@ -23,6 +24,7 @@ %setup -q -c -n treetop-%{version} tar xzf data.tar.gz cp %{_datadir}/setup.rb . +%patch0 -p1 %build ruby setup.rb config \ @@ -60,6 +62,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.2 2009/08/09 21:32:30 aredridel +- add de-gemming patch + Revision 1.1 2009/08/09 21:27:12 aredridel - added ================================================================ Index: packages/ruby-treetop/ruby-treetop-gems.patch diff -u /dev/null packages/ruby-treetop/ruby-treetop-gems.patch:1.1 --- /dev/null Sun Aug 9 23:32:35 2009 +++ packages/ruby-treetop/ruby-treetop-gems.patch Sun Aug 9 23:32:30 2009 @@ -0,0 +1,66 @@ +diff -ur treetop-1.3.0-o/bin/tt treetop-1.3.0/bin/tt +--- treetop-1.3.0-o/bin/tt 1969-12-31 17:00:00.000000000 -0700 ++++ treetop-1.3.0/bin/tt 2009-08-09 15:25:57.479000736 -0600 +@@ -1,8 +1,4 @@ + #!/usr/bin/env ruby +-require 'rubygems' +-gem 'treetop' +- +-$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib")) + require 'treetop' + + if ARGV.empty? +diff -ur treetop-1.3.0-o/lib/treetop/bootstrap_gen_1_metagrammar.rb treetop-1.3.0/lib/treetop/bootstrap_gen_1_metagrammar.rb +--- treetop-1.3.0-o/lib/treetop/bootstrap_gen_1_metagrammar.rb 1969-12-31 17:00:00.000000000 -0700 ++++ treetop-1.3.0/lib/treetop/bootstrap_gen_1_metagrammar.rb 2009-08-09 15:28:09.252772466 -0600 +@@ -1,16 +1,7 @@ + # This file's job is to load a Treetop::Compiler::Metagrammar and Treetop::Compiler::MetagrammarParser + # into the environment by compiling the current metagrammar.treetop using a trusted version of Treetop. + +-require 'rubygems' +-dir = File.dirname(__FILE__) +- +-TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP = '>= 1.1.5' +- +-# Loading trusted version of Treetop to compile the compiler +-gem_spec = Gem.source_index.find_name('treetop', TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP).last +-raise "Install a Treetop Gem version #{TREETOP_VERSION_REQUIRED_TO_BOOTSTRAP} to bootstrap." unless gem_spec +-trusted_treetop_path = gem_spec.full_gem_path +-require File.join(trusted_treetop_path, 'lib', 'treetop') ++require 'treetop' + + # Relocating trusted version of Treetop to Trusted::Treetop + Trusted = Module.new +@@ -20,7 +11,6 @@ + + # Requiring version of Treetop that is under test + $exclude_metagrammar = true +-require File.expand_path(File.join(dir, '..', 'treetop')) + + # Compile and evaluate freshly generated metagrammar source + METAGRAMMAR_PATH = File.join(TREETOP_ROOT, 'compiler', 'metagrammar.treetop') +@@ -42,4 +32,4 @@ + # include Trusted::Treetop::Runtime + # end + +-$bootstrapped_gen_1_metagrammar = true +\ No newline at end of file ++$bootstrapped_gen_1_metagrammar = true +diff -ur treetop-1.3.0-o/lib/treetop.rb treetop-1.3.0/lib/treetop.rb +--- treetop-1.3.0-o/lib/treetop.rb 1969-12-31 17:00:00.000000000 -0700 ++++ treetop-1.3.0/lib/treetop.rb 2009-08-09 15:27:12.195268768 -0600 +@@ -1,11 +1,6 @@ +-require 'rubygems' +- +-dir = File.dirname(__FILE__) +- +-TREETOP_ROOT = File.join(dir, 'treetop') +-require File.join(TREETOP_ROOT, "ruby_extensions") +-require File.join(TREETOP_ROOT, "runtime") +-require File.join(TREETOP_ROOT, "compiler") ++require "treetop/ruby_extensions" ++require "treetop/runtime" ++require "treetop/compiler" + + require 'polyglot' + Polyglot.register(["treetop", "tt"], Treetop) ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-treetop/ruby-treetop.spec?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
