[rubygem-treetop] Rebuilt for Ruby 1.9.3.

Bohuslav Kabrda bkabrda at fedoraproject.org
Mon Jan 30 14:31:36 UTC 2012


commit 6f0188713e3c4002259ae967b77cd968c9e8b7c8
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Mon Jan 30 15:27:09 2012 +0100

    Rebuilt for Ruby 1.9.3.

 rubygem-treetop.spec                 |   72 +++++++++++++++++-----------------
 treetop-downgrade-polyglot-dep.patch |   27 -------------
 2 files changed, 36 insertions(+), 63 deletions(-)
---
diff --git a/rubygem-treetop.spec b/rubygem-treetop.spec
index c44bbd0..9db23c5 100644
--- a/rubygem-treetop.spec
+++ b/rubygem-treetop.spec
@@ -1,27 +1,24 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname treetop
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name treetop
 
 Summary:        A Ruby-based text parsing and interpretation DSL
-Name:           rubygem-%{gemname}
+Name:           rubygem-%{gem_name}
 Version:        1.4.10
-Release:        1%{?dist}
+Release:        2%{?dist}
 Group:          Development/Languages
 License:        MIT
 URL:            http://treetop.rubyforge.org/
-Source0:        http://rubygems.org/downloads/%{gemname}-%{version}.gem
+Source0:        http://rubygems.org/downloads/%{gem_name}-%{version}.gem
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires:       ruby(abi) = 1.8
-Requires:       rubygems
+Requires:       ruby(abi) = 1.9.1
+Requires:       ruby(rubygems)
 Requires:       rubygem(polyglot)
-BuildRequires:  rubygems
+BuildRequires:  rubygems-devel
 # The Following are required for testing
 #BuildRequires:  rubygem(rake)
 #BuildRequires:  rubygem(rspec)
 #BuildRequires:  rubygem(ruby-debug)
 BuildArch:      noarch
-Provides:       rubygem(%{gemname}) = %{version}
+Provides:       rubygem(%{gem_name}) = %{version}
 
 %description
 Treetop is a language for describing languages. It helps you analyze syntax.
@@ -29,27 +26,27 @@ 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} \
+mkdir -p .%{gem_dir}
+gem install --local --install-dir .%{gem_dir} \
             -V \
             --force --rdoc %{SOURCE0}
 
-pushd ./%{gemdir}
+pushd ./%{gem_dir}
 
 %build
 
 
 %install
-mkdir -p $RPM_BUILD_ROOT%{gemdir}
-cp -a .%{gemdir}/* %{buildroot}%{gemdir}/
+mkdir -p $RPM_BUILD_ROOT%{gem_dir}
+cp -a .%{gem_dir}/* %{buildroot}%{gem_dir}/
 mkdir -p $RPM_BUILD_ROOT/%{_bindir}
-mv $RPM_BUILD_ROOT%{gemdir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
-rmdir $RPM_BUILD_ROOT%{gemdir}/bin
-find $RPM_BUILD_ROOT%{geminstdir}/bin -type f |xargs chmod a+x
-find $RPM_BUILD_ROOT%{gemdir} -name '*.rb' |xargs chmod a-x
+mv $RPM_BUILD_ROOT%{gem_dir}/bin/* $RPM_BUILD_ROOT/%{_bindir}
+rmdir $RPM_BUILD_ROOT%{gem_dir}/bin
+find $RPM_BUILD_ROOT%{gem_instdir}/bin -type f |xargs chmod a+x
+find $RPM_BUILD_ROOT%{gem_dir} -name '*.rb' |xargs chmod a-x
 
 # Remove zero-length documentation files
-find $RPM_BUILD_ROOT%{gemdir}/doc/%{gemname}-%{version} -empty -delete
+find $RPM_BUILD_ROOT%{gem_docdir} -empty -delete
 
 
 %clean
@@ -57,28 +54,31 @@ rm -rf $RPM_BUILD_ROOT
 
 # Uncomment as soon as we have rubygem-rr in fedora
 #%check
-#pushd %{buildroot}%{geminstdir}
+#pushd %{buildroot}%{gem_instdir}
 #rake spec
 
 %files
 %defattr(-,root,root,-)
 %{_bindir}/tt
-%dir %{geminstdir}
-%{geminstdir}/bin
-%{geminstdir}/lib
-%{geminstdir}/Rakefile
-%doc %{geminstdir}/doc
-%doc %{geminstdir}/examples
-%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
+%dir %{gem_instdir}
+%{gem_instdir}/bin
+%{gem_libdir}
+%{gem_instdir}/Rakefile
+%doc %{gem_instdir}/doc
+%doc %{gem_instdir}/examples
+%doc %{gem_instdir}/README.md
+%doc %{gem_instdir}/LICENSE
+%doc %{gem_instdir}/spec
+%doc %{gem_instdir}/%{gem_name}.gemspec
+%doc %{gem_docdir}
+%{gem_cache}
+%{gem_spec}
 
 
 %changelog
+* Mon Jan 30 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.4.10-2
+- Rebuilt for Ruby 1.9.3.
+
 * Sun Jan 08 2012 <stahnma at fedoraproject.org> - 1.4.10-1
 - Rebuilt and fix bz#716045
 
@@ -97,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
 
 * Mon Jun 08 2009 Lubomir Rintel (Good Data) <lubo.rintel at gooddata.com> - 1.2.5-2
 - Fix up documentation list
-- Use geminstdir macro where appropriate
+- Use gem_instdir macro where appropriate
 - Do not move examples around
 - Depend on ruby(abi)
 - Replace defines with globals


More information about the scm-commits mailing list