[rubygem-erubis] Update to Erubis 2.7.0.

Bohuslav Kabrda bkabrda at fedoraproject.org
Wed Jul 18 10:59:38 UTC 2012


commit b86f55f0509a470b784a0e49ae8e2d0390de93d9
Author: Bohuslav Kabrda <bkabrda at redhat.com>
Date:   Wed Jul 18 12:58:53 2012 +0200

    Update to Erubis 2.7.0.
    
    - Removed unneeded %defattr usage.
    - Removed no longer needed rubygem(abstract) dependency.
    - Remove no longer needed test patch.

 .gitignore          |    2 ++
 rubygem-erubis.spec |   27 ++++++++++++++++-----------
 sources             |    3 ++-
 3 files changed, 20 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c47bf89..e6a8ac3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 erubis-2.6.5.gem
 /erubis-2.6.6.gem
+/erubis-2.7.0-public_html.tgz
+/erubis-2.7.0.gem
diff --git a/rubygem-erubis.spec b/rubygem-erubis.spec
index 634b6c1..0449257 100644
--- a/rubygem-erubis.spec
+++ b/rubygem-erubis.spec
@@ -5,19 +5,20 @@
 
 Summary: A fast and extensible eRuby implementation
 Name: rubygem-%{gem_name}
-Version: 2.6.6
-Release: 3%{?dist}
+Version: 2.7.0
+Release: 1%{?dist}
 Group: Development/Languages
 License: MIT
 URL: http://www.kuwata-lab.com/erubis/
 Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
-Patch0: erubis-fix-tests-for-ruby-1.9.3.patch
+# needed for tests, to get it, run
+# git clone https://github.com/kwatch/erubis && cd erubis
+# git checkout 14d3eab57f && tar czvf erubis-2.7.0-public_html.tgz public_html
+Source1: %{gem_name}-%{version}-public_html.tgz
 Requires: ruby(rubygems)
 Requires: ruby(abi) = %{rubyabi}
-Requires: rubygem(abstract) >= 1.0.0
 BuildRequires: rubygems-devel
 BuildRequires: ruby(abi) = %{rubyabi}
-BuildRequires: rubygem(abstract)
 BuildRequires: rubygem(minitest)
 BuildArch: noarch
 Provides: rubygem(%{gem_name}) = %{version}
@@ -41,10 +42,6 @@ gem install --local --install-dir .%{gem_dir} \
             --bindir .%{_bindir} \
             --force --rdoc %{SOURCE0}
 
-pushd .%{gem_instdir}
-%patch0 -p0
-popd
-
 %build
 
 %install
@@ -73,12 +70,12 @@ export GEM_PATH=%{buildroot}%{gem_dir}:%{gem_dir}
 export PATH=%{buildroot}%{_bindir}:$PATH
 
 pushd %{buildroot}%{gem_instdir}
+tar xzf %{SOURCE1}
 # TODO: 2 tests are still failin, please investigate
-ruby -ryaml -e "YAML::ENGINE.yamler='syck'; Dir.glob('./test/test-*.rb').each {|t| require t}" || :
+ruby -ryaml -e "YAML::ENGINE.yamler='syck'; Dir.glob('./test/test-*.rb').each {|t| require t}" | grep "159 tests, 235 assertions, 2 failures, 0 errors, 0 skips"
 popd
 
 %files
-%defattr(-,root,root,-)
 %{_bindir}/erubis
 %doc %{gem_instdir}/CHANGES.txt
 %doc %{gem_instdir}/MIT-LICENSE
@@ -87,6 +84,8 @@ popd
 
 # We install via gem
 %exclude %{gem_instdir}/setup.rb
+# Only needed for tests
+%exclude %{gem_instdir}/public_html
 
 %{gem_instdir}/bin
 %{gem_libdir}
@@ -107,6 +106,12 @@ popd
 %{gem_docdir}
 
 %changelog
+* Wed Jul 18 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 2.7.0-1
+- Update to Erubis 2.7.0.
+- Removed unneeded %%defattr usage.
+- Removed no longer needed rubygem(abstract) dependency.
+- Remove no longer needed test patch.
+
 * Tue Jan 31 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 2.6.6-3
 - Rebuilt for Ruby 1.9.3.
 
diff --git a/sources b/sources
index 7682cce..59f3da7 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-7478afe8960ce37078f784f7a2aa5f74  erubis-2.6.6.gem
+4b284994777d2a9cee2081cb4f52fcbf  erubis-2.7.0-public_html.tgz
+cca3cf13ef951d1fc8c124d2fde52565  erubis-2.7.0.gem


More information about the scm-commits mailing list