[rubygem-treetop] updated treetop to 1.4.9

Mohammed Morsi mmorsi at fedoraproject.org
Sun Jan 23 17:16:50 UTC 2011


commit a35f5bf323e0c98e990655f57e016340c778dd2f
Author: Mohammed Morsi <mmorsi at redhat.com>
Date:   Sun Jan 23 11:58:01 2011 -0500

    updated treetop to 1.4.9

 .gitignore                           |    1 +
 rubygem-treetop.spec                 |   30 ++++++++++++++++++++++++------
 sources                              |    2 +-
 treetop-downgrade-polyglot-dep.patch |   27 +++++++++++++++++++++++++++
 4 files changed, 53 insertions(+), 7 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c318fa9..115d090 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 treetop-1.3.0.gem
+/treetop-1.4.9.gem
diff --git a/rubygem-treetop.spec b/rubygem-treetop.spec
index 38da044..f84633a 100644
--- a/rubygem-treetop.spec
+++ b/rubygem-treetop.spec
@@ -5,17 +5,21 @@
 
 Summary:        A Ruby-based text parsing and interpretation DSL
 Name:           rubygem-%{gemname}
-Version:        1.3.0
+Version:        1.4.9
 Release:        1%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://treetop.rubyforge.org/
-Source0:        http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
+Source0:        http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Patch0:         treetop-downgrade-polyglot-dep.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires:       ruby(abi) = 1.8
 Requires:       rubygems
 Requires:       rubygem(polyglot) >= 0
 BuildRequires:  rubygems
+#BuildRequires(check):  rubygem(rake)
+#BuildRequires(check):  rubygem(rspec)
+#BuildRequires(check):  rubygem(ruby-debug)
 BuildArch:      noarch
 Provides:       rubygem(%{gemname}) = %{version}
 
@@ -24,16 +28,21 @@ Treetop is a language for describing languages. It helps you analyze syntax.
 
 
 %prep
+%setup -q -c -T
+mkdir -p .%{gemdir}
+gem install --local --install-dir .%{gemdir} \
+            -V \
+            --force --rdoc %{SOURCE0}
 
+pushd ./%{gemdir}
+%patch0 -p0
 
 %build
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{gemdir}
-gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
-        --force %{SOURCE0}
+cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
 mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
 rmdir $RPM_BUILD_ROOT%{gemdir}/bin
@@ -47,6 +56,10 @@ find $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version} -empty -delete
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+# Uncomment as soon as we have rubygem-rr in fedora
+#%check
+#pushd %{buildroot}%{geminstdir}
+#rake spec
 
 %files
 %defattr(-,root,root,-)
@@ -57,14 +70,19 @@ rm -rf $RPM_BUILD_ROOT
 %{geminstdir}/Rakefile
 %doc %{geminstdir}/doc
 %doc %{geminstdir}/examples
-%doc %{geminstdir}/README
+%doc %{geminstdir}/README.md
 %doc %{geminstdir}/LICENSE
+%doc %{geminstdir}/spec
+%doc %{geminstdir}/%{gemname}.gemspec
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{gemdir}/cache/%{gemname}-%{version}.gem
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 
 %changelog
+* Mon Jan 10 2011 Mohammed Morsi <mmorsi at redhat.com> - 1.4.9-1
+- Updated to latest upstream release
+
 * Fri Jul 31 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.3.0-1
 - Update to new upstream version
 - Mark more documentation files as such
diff --git a/sources b/sources
index 0244ed2..d2000f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a1fbf9629f8052eeff592d437c8b47a6  treetop-1.3.0.gem
+73f8cc6855f56c3b6129bcbb0f31552d  treetop-1.4.9.gem
diff --git a/treetop-downgrade-polyglot-dep.patch b/treetop-downgrade-polyglot-dep.patch
new file mode 100644
index 0000000..928b857
--- /dev/null
+++ b/treetop-downgrade-polyglot-dep.patch
@@ -0,0 +1,27 @@
+--- gems/treetop-1.4.9/treetop.gemspec.orig	2011-01-18 15:55:53.588405001 -0500
++++ gems/treetop-1.4.9/treetop.gemspec	2011-01-18 15:56:46.965405337 -0500
+@@ -13,6 +13,6 @@ $gemspec = Gem::Specification.new do |s|
+   s.require_path = "lib"
+   s.autorequire = "treetop"
+   s.has_rdoc = false
+-  s.add_dependency "polyglot", ">= 0.3.1"
++  s.add_dependency "polyglot", ">= 0.2.5"
+ end
+ 
+--- specifications/treetop-1.4.9.gemspec.orig	2011-01-18 16:12:29.793405001 -0500
++++ specifications/treetop-1.4.9.gemspec	2011-01-18 16:13:21.157405397 -0500
+@@ -22,11 +22,11 @@ Gem::Specification.new do |s|
+     s.specification_version = 3
+ 
+     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+-      s.add_runtime_dependency(%q<polyglot>, [">= 0.3.1"])
++      s.add_runtime_dependency(%q<polyglot>, [">= 0.2.5"])
+     else
+-      s.add_dependency(%q<polyglot>, [">= 0.3.1"])
++      s.add_dependency(%q<polyglot>, [">= 0.2.5"])
+     end
+   else
+-    s.add_dependency(%q<polyglot>, [">= 0.3.1"])
++    s.add_dependency(%q<polyglot>, [">= 0.2.5"])
+   end
+ end


More information about the scm-commits mailing list