[rubygem-syntax] Rebuilt for Ruby 1.9.3. Introduced %check section. Added patch for Ruby 1.9.3 tests.
Vít Ondruch
vondruch at fedoraproject.org
Tue Jan 31 14:26:45 UTC 2012
commit d00f3fb9fb5d5b4f7a52ccec943878af943cbad4
Author: Vít Ondruch <vondruch at redhat.com>
Date: Tue Jan 31 15:26:33 2012 +0100
Rebuilt for Ruby 1.9.3.
Introduced %check section.
Added patch for Ruby 1.9.3 tests.
rubygem-syntax-fix-yaml-parse-for-ruby-1.9.patch | 11 +++++
rubygem-syntax.spec | 52 +++++++++++++--------
2 files changed, 43 insertions(+), 20 deletions(-)
---
diff --git a/rubygem-syntax-fix-yaml-parse-for-ruby-1.9.patch b/rubygem-syntax-fix-yaml-parse-for-ruby-1.9.patch
new file mode 100644
index 0000000..707192a
--- /dev/null
+++ b/rubygem-syntax-fix-yaml-parse-for-ruby-1.9.patch
@@ -0,0 +1,11 @@
+--- lib/syntax/lang/yaml.rb.orig 2012-01-31 15:07:34.533346064 +0100
++++ lib/syntax/lang/yaml.rb 2012-01-31 15:06:26.365562358 +0100
+@@ -62,7 +62,7 @@
+ start_group :string
+ loop do
+ line = check_until(/[\n\r]|\Z/)
+- break if line.nil?
++ break if line.nil? or line.empty?
+ if line.chomp.length > 0
+ this_indent = line.chomp.match( /^\s*/ )[0]
+ break if this_indent.length < indent.length
diff --git a/rubygem-syntax.spec b/rubygem-syntax.spec
index 2025f61..3e97d39 100644
--- a/rubygem-syntax.spec
+++ b/rubygem-syntax.spec
@@ -1,23 +1,22 @@
-%global ruby_sitelib %(ruby -rrbconfig -e "puts Config::CONFIG['sitelibdir']")
-%global gemdir %(ruby -rubygems -e 'puts Gem::dir' 2>/dev/null)
-%global gemname syntax
-%global geminstdir %{gemdir}/gems/%{gemname}-%{version}
+%global gem_name syntax
Summary: Ruby library for performing simple syntax highlighting
-Name: rubygem-%{gemname}
+Name: rubygem-%{gem_name}
Version: 1.0.0
-Release: 5%{?dist}
+Release: 6%{?dist}
Group: Development/Languages
License: Public Domain
URL: http://syntax.rubyforge.org/
-Source0: http://gems.rubyforge.org/gems/%{gemname}-%{version}.gem
-Source1: %{gemname}-LICENSE
+Source0: http://gems.rubyforge.org/gems/%{gem_name}-%{version}.gem
+Source1: %{gem_name}-LICENSE
+Patch0: rubygem-syntax-fix-yaml-parse-for-ruby-1.9.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Requires: ruby(abi) = 1.8
-Requires: rubygems
-BuildRequires: rubygems
+Requires: ruby(abi) = 1.9.1
+Requires: ruby(rubygems)
+BuildRequires: rubygems-devel
+BuildRequires: rubygem(minitest)
BuildArch: noarch
-Provides: rubygem(%{gemname}) = %{version}
+Provides: rubygem(%{gem_name}) = %{version}
%description
Syntax is a lexical analysis framework. It supports pluggable syntax
@@ -26,32 +25,45 @@ modules, and comes with modules for Ruby, XML, and YAML.
%prep
install -pm 0644 %{SOURCE1} LICENSE
+mkdir -p .{gem_dir}
+gem install --local --install-dir .%{gem_dir} \
+ --force --rdoc %{SOURCE0}
+pushd .%{gem_instdir}
+%patch0
+popd
%build
%install
rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{gemdir}
-gem install --local --install-dir $RPM_BUILD_ROOT%{gemdir} \
- --force --rdoc %{SOURCE0}
-
+mkdir -p $RPM_BUILD_ROOT%{gem_dir}
+cp -a .%{gem_dir}/* $RPM_BUILD_ROOT%{gem_dir}
%clean
rm -rf $RPM_BUILD_ROOT
+%check
+pushd .%{gem_instdir}
+ruby -Itest test/ALL-TESTS.rb
+popd
%files
%defattr(-,root,root,-)
-%{geminstdir}/
-%doc %{gemdir}/doc/%{gemname}-%{version}
-%{gemdir}/cache/%{gemname}-%{version}.gem
-%{gemdir}/specifications/%{gemname}-%{version}.gemspec
+%{gem_instdir}/
+%doc %{gem_docdir}
+%{gem_cache}
+%{gem_spec}
%doc LICENSE
%changelog
+* Tue Jan 31 2012 Bohuslav Kabrda <bkabrda at redhat.com> - 1.0.0-6
+- Rebuilt for Ruby 1.9.3.
+- Introduced %%check section.
+- Added patch for Ruby 1.9.3 tests.
+
* Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.0.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
More information about the scm-commits
mailing list