[rubygem-mizuho/el6] fixes for el6
tdawson
tdawson at fedoraproject.org
Wed May 14 19:33:25 UTC 2014
commit 7b6cd8e2a6c44984f48fe3b96d192833588649df
Author: Troy Dawson <tdawson at redhat.com>
Date: Wed May 14 14:32:41 2014 -0500
fixes for el6
...em-mizuho-0.9.20-fix_native_templates_dir.patch | 12 ++++++++++++
rubygem-mizuho.spec | 11 +++++++++--
2 files changed, 21 insertions(+), 2 deletions(-)
---
diff --git a/rubygem-mizuho-0.9.20-fix_native_templates_dir.patch b/rubygem-mizuho-0.9.20-fix_native_templates_dir.patch
new file mode 100644
index 0000000..0b94b99
--- /dev/null
+++ b/rubygem-mizuho-0.9.20-fix_native_templates_dir.patch
@@ -0,0 +1,12 @@
+diff -urp mizuho-0.9.20.orig/lib/mizuho.rb mizuho-0.9.20/lib/mizuho.rb
+--- mizuho-0.9.20.orig/lib/mizuho.rb 2014-03-05 15:42:40.061305747 -0600
++++ mizuho-0.9.20/lib/mizuho.rb 2014-03-05 15:43:20.579353231 -0600
+@@ -23,7 +23,7 @@ module Mizuho
+ NATIVELY_PACKAGED = true
+
+ if NATIVELY_PACKAGED
+- TEMPLATES_DIR = "/usr/share/mizuho/templates"
++ TEMPLATES_DIR = "/usr/share/gems/gems/mizuho-%s/templates" % (VERSION_STRING)
+ if File.exist?("/usr/share/mizuho/asciidoc")
+ ASCIIDOC = ["/usr/bin/python", "/usr/share/mizuho/asciidoc/asciidoc.py"]
+ else
diff --git a/rubygem-mizuho.spec b/rubygem-mizuho.spec
index 725f206..7fa354e 100644
--- a/rubygem-mizuho.spec
+++ b/rubygem-mizuho.spec
@@ -7,16 +7,17 @@
Summary: Mizuho documentation formatting tool
Name: rubygem-%{gem_name}
Version: 0.9.20
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: Development/Languages
License: MIT
URL: https://github.com/FooBarWidget/mizuho
Source0: https://rubygems.org/gems/%{gem_name}-%{version}.gem
+Patch1: rubygem-mizuho-0.9.20-fix_native_templates_dir.patch
Requires: asciidoc
Requires: ruby(abi) >= %{rubyabi}
Requires: ruby(rubygems)
Requires: rubygem(nokogiri) >= 1.4.0
-Requires: rubygem(sqlite3)
+Requires: rubygem(sqlite3-ruby)
BuildRequires: ruby(abi) >= %{rubyabi}
BuildRequires: rubygems-devel
%if 0%{?enable_tests}
@@ -53,6 +54,8 @@ sed -i -e 's\ "asciidoc[^,]*,\\g' %{gem_name}.gemspec
# Fixup rpmlint failures
echo "#toc.html" >> templates/toc.html
+%patch1 -p 1
+
%build
gem build %{gem_name}.gemspec
%gem_install
@@ -99,6 +102,10 @@ popd
%changelog
+* Wed May 14 2014 Troy Dawson <tdawson at redhat.com> - 0.9.20-3
+- Fix native templated directory (#1072246)
+- Different sqlite gem name in EPEL6 (František Dvořák)
+
* Wed Feb 19 2014 Troy Dawson <tdawson at redhat.com> - 0.9.20-2
- Remove bundled asciidoc
More information about the scm-commits
mailing list