packages: ruby-treetop/ruby-treetop-gems.patch, ruby-treetop/ruby-treetop.s...

baggins baggins at pld-linux.org
Tue Mar 2 16:35:42 CET 2010 

Author: baggins                      Date: Tue Mar  2 15:35:42 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 1.4.4
- added rdoc and ri packages

---- Files affected:
packages/ruby-treetop:
   ruby-treetop-gems.patch (1.1 -> 1.2) , ruby-treetop.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/ruby-treetop/ruby-treetop-gems.patch
diff -u packages/ruby-treetop/ruby-treetop-gems.patch:1.1 packages/ruby-treetop/ruby-treetop-gems.patch:1.2
--- packages/ruby-treetop/ruby-treetop-gems.patch:1.1	Sun Aug  9 23:32:30 2009
+++ packages/ruby-treetop/ruby-treetop-gems.patch	Tue Mar  2 16:35:37 2010
@@ -1,18 +1,19 @@
-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
+diff -ur ruby-treetop-1.4.4/bin/tt ruby-treetop-1.4.4-nogems/bin/tt
+--- ruby-treetop-1.4.4/bin/tt	2010-02-20 01:30:39.000000000 +0100
++++ ruby-treetop-1.4.4-nogems/bin/tt	2010-03-02 16:20:08.889260038 +0100
+@@ -1,8 +1,6 @@
+-#!/usr/bin/env ruby
++#!/usr/bin/ruby
+ require 'optparse'
 -require 'rubygems'
--gem 'treetop'
--
+ 
 -$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../lib"))
  require 'treetop'
+ require 'treetop/version'
  
- 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
+diff -ur ruby-treetop-1.4.4/lib/treetop/bootstrap_gen_1_metagrammar.rb ruby-treetop-1.4.4-nogems/lib/treetop/bootstrap_gen_1_metagrammar.rb
+--- ruby-treetop-1.4.4/lib/treetop/bootstrap_gen_1_metagrammar.rb	2010-02-20 01:30:39.000000000 +0100
++++ ruby-treetop-1.4.4-nogems/lib/treetop/bootstrap_gen_1_metagrammar.rb	2010-03-02 16:22:50.532123974 +0100
 @@ -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.
@@ -46,15 +47,19 @@
 -$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 @@
+diff -ur ruby-treetop-1.4.4/lib/treetop.rb ruby-treetop-1.4.4-nogems/lib/treetop.rb
+--- ruby-treetop-1.4.4/lib/treetop.rb	2010-02-20 01:30:39.000000000 +0100
++++ ruby-treetop-1.4.4-nogems/lib/treetop.rb	2010-03-02 16:23:57.301124234 +0100
+@@ -1,5 +1,3 @@
 -require 'rubygems'
 -
--dir = File.dirname(__FILE__)
--
--TREETOP_ROOT = File.join(dir, 'treetop')
+ module Treetop
+   VALID_GRAMMAR_EXT = ['treetop', 'tt']
+   VALID_GRAMMAR_EXT_REGEXP = /\.(#{VALID_GRAMMAR_EXT.join('|')})\Z/o
+@@ -8,9 +6,9 @@
+ 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")
@@ -63,4 +68,4 @@
 +require "treetop/compiler"
  
  require 'polyglot'
- Polyglot.register(["treetop", "tt"], Treetop)
+ Polyglot.register(Treetop::VALID_GRAMMAR_EXT, Treetop)

================================================================
Index: packages/ruby-treetop/ruby-treetop.spec
diff -u packages/ruby-treetop/ruby-treetop.spec:1.2 packages/ruby-treetop/ruby-treetop.spec:1.3
--- packages/ruby-treetop/ruby-treetop.spec:1.2	Sun Aug  9 23:32:30 2009
+++ packages/ruby-treetop/ruby-treetop.spec	Tue Mar  2 16:35:37 2010
@@ -1,17 +1,20 @@
 # $Revision$, $Date$
+%define pkgname treetop
 Summary:	A packrat parser implementation for Ruby
-Name:		ruby-treetop
-Version:	1.3.0
+Name:		ruby-%{pkgname}
+Version:	1.4.4
 Release:	1
 License:	Ruby's
 Group:		Development/Languages
-Source0:	http://gems.rubyforge.org/gems/treetop-1.3.0.gem
-# Source0-md5:	a1fbf9629f8052eeff592d437c8b47a6
-Patch0:	%{name}-gems.patch
+Source0:	http://rubygems.org/downloads/%{pkgname}-%{version}.gem
+# Source0-md5:	ec3ab6dd87a435837f1bd2b67543446a
+Patch0:		%{name}-gems.patch
 URL:		http://treetop.rubyforge.org
-BuildRequires:	rake
-BuildRequires:	rpmbuild(macros) >= 1.277
-BuildRequires:	setup.rb = 3.4.1
+BuildRequires:	rpmbuild(macros) >= 1.484
+BuildRequires:	ruby >= 1:1.8.6
+BuildRequires:	ruby-modules
+BuildRequires:	ruby-rake
+Requires:	ruby-plyglot
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -20,12 +23,38 @@
 syntax-oriented programming. There's a readme that will get you going and some
 examples.
 
+%package rdoc
+Summary:	HTML documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla %{pkgname}
+Group:		Documentation
+Requires:	ruby >= 1:1.8.7-4
+
+%description rdoc
+HTML documentation for %{pkgname}.
+
+%description rdoc -l pl.UTF-8
+Dokumentacja w formacie HTML dla %{pkgname}.
+
+%package ri
+Summary:	ri documentation for %{pkgname}
+Summary(pl.UTF-8):	Dokumentacja w formacie ri dla %{pkgname}
+Group:		Documentation
+Requires:	ruby
+
+%description ri
+ri documentation for %{pkgname}.
+
+%description ri -l pl.UTF-8
+Dokumentacji w formacie ri dla %{pkgname}.
+
 %prep
-%setup -q -c -n treetop-%{version}
-tar xzf data.tar.gz
-cp %{_datadir}/setup.rb .
+%setup -q -c
+%{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
+find -newer README.md -o -print | xargs touch --reference %{SOURCE0}
 %patch0 -p1
 
+cp %{_datadir}/setup.rb .
+
 %build
 ruby setup.rb config \
 	--rbdir=%{ruby_rubylibdir} \
@@ -35,26 +64,35 @@
 
 rdoc --op rdoc lib
 rdoc --ri --op ri lib
+rm -r ri/{IntervalSkipList,String}
+rm ri/created.rid
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{ruby_archdir},%{ruby_ridir}}
+install -d $RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}}
 
 ruby setup.rb install \
 	--prefix=$RPM_BUILD_ROOT
 
-rm ri/created.rid ri/String/cdesc-String.yaml
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
+cp -a rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(644,root,root,755)
-%doc rdoc
+%doc README.md doc/* examples
 %attr(755,root,root) %{_bindir}/tt
 %{ruby_rubylibdir}/treetop*
-%{ruby_ridir}/*
+
+%files rdoc
+%defattr(644,root,root,755)
+%{ruby_rdocdir}/%{name}-%{version}
+
+%files ri
+%defattr(644,root,root,755)
+%{ruby_ridir}/Treetop
 
 %define	date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -62,6 +100,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2010/03/02 15:35:37  baggins
+- updated to 1.4.4
+- added rdoc and ri packages
+
 Revision 1.2  2009/08/09 21:32:30  aredridel
 - add de-gemming patch
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-treetop/ruby-treetop-gems.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/ruby-treetop/ruby-treetop.spec?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list