[rubygem-tilt] Updated to the tilt 1.3.2. Test suite for erubis, haml, builder and RedCloth template engines enable

Vít Ondruch vondruch at fedoraproject.org
Wed Jul 20 08:28:59 UTC 2011


commit 13e669a9bd7cca120e4f31a61cdbca54fb212586
Author: Vít Ondruch <vondruch at redhat.com>
Date:   Wed Jul 20 10:28:43 2011 +0200

    Updated to the tilt 1.3.2.
    Test suite for erubis, haml, builder and RedCloth template engines enabled.

 .gitignore        |    1 +
 rubygem-tilt.spec |   37 ++++++++++++++++++++++++++++---------
 sources           |    2 +-
 3 files changed, 30 insertions(+), 10 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 983d758..ac644bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /tilt-1.2.2.gem
+/tilt-1.3.2.gem
diff --git a/rubygem-tilt.spec b/rubygem-tilt.spec
index 39fe0c6..4aeb504 100644
--- a/rubygem-tilt.spec
+++ b/rubygem-tilt.spec
@@ -1,12 +1,14 @@
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global gemname tilt
+
+%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
 %global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+
 %global rubyabi 1.8
 
 Summary: Generic interface to multiple Ruby template engines
 Name: rubygem-%{gemname}
-Version: 1.2.2
-Release: 3%{?dist}
+Version: 1.3.2
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://github.com/rtomayko/%{gemname}
@@ -15,10 +17,24 @@ Source0: http://rubygems.org/gems/%{gemname}-%{version}.gem
 # https://github.com/rtomayko/tilt/issues/93
 Patch0: Fix-compilesite-test-for-multiple-threads.patch
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygems
+Requires: ruby(rubygems)
 Requires: ruby
-BuildRequires: rubygems
+BuildRequires: ruby(abi) = %{rubyabi}
+BuildRequires: ruby(rubygems)
 BuildRequires: ruby
+BuildRequires: rubygem(nokogiri)
+BuildRequires: rubygem(erubis)
+BuildRequires: rubygem(haml)
+BuildRequires: rubygem(builder)
+BuildRequires: rubygem(RedCloth)
+
+# Markaby test fails. It is probably due to rather old version found in Fedora.
+# https://github.com/rtomayko/tilt/issues/96
+# BuildRequires: rubygem(markaby)
+
+# RDiscount test fails. Is it due to old version in Fedora?
+# BuildRequires: rubygem(rdiscount)
+
 BuildArch: noarch
 Provides: rubygem(%{gemname}) = %{version}
 
@@ -60,11 +76,12 @@ find %{buildroot}%{geminstdir}/bin -type f | xargs chmod a+x
 
 %check
 pushd %{buildroot}%{geminstdir}
-RUBYOPT="Ilib" testrb test/*_test.rb
+RUBYOPT="rubygems Ilib" testrb test/*_test.rb
+popd
 
 %files
-%defattr(-, root, root, -)
 %{_bindir}/%{gemname}
+%exclude %{geminstdir}/%{gemname}.gemspec
 %{geminstdir}/bin
 %{geminstdir}/lib
 %doc %{geminstdir}/COPYING
@@ -74,14 +91,16 @@ RUBYOPT="Ilib" testrb test/*_test.rb
 %{gemdir}/specifications/%{gemname}-%{version}.gemspec
 
 %files doc
-%defattr(-, root, root, -)
 %{geminstdir}/Rakefile
-%{geminstdir}/%{gemname}.gemspec
 %doc %{gemdir}/doc/%{gemname}-%{version}
 %{geminstdir}/test
 
 
 %changelog
+* Wed Jul 20 2011 Vít Ondruch <vondruch at redhat.com> - 1.3.2-1
+- Updated to the tilt 1.3.2.
+- Test suite for erubis, haml, builder and RedCloth template engines enabled.
+
 * Fri Jun 24 2011 Vít Ondruch <vondruch at redhat.com> - 1.2.2-3
 - Fixes FTBFS (rhbz#715713).
 
diff --git a/sources b/sources
index 6245e50..00cfb05 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cd5c51ead24d7b546a3be45a892d3316  tilt-1.2.2.gem
+051ac16af939e4fcc67ef28a4393635a  tilt-1.3.2.gem


More information about the scm-commits mailing list