Try to enable mizuho again, with the sed workaround.

diff --git a/rubygem-passenger-disable-mizuho.patch b/rubygem-passenger-disable-mizuho.patch
deleted file mode 100644 (file)
index 5e75e16..0000000
--- a/rubygem-passenger-disable-mizuho.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- build/documentation.rb.orig        2013-10-27 00:00:00.000000000 +0200
-+++ build/documentation.rb     2014-06-19 17:06:06.000000000 +0200
-@@ -45,7 +45,7 @@ Packaging::ASCII_DOCS.each do |target|
-               if juvia_site_key
-                       command << " -c juvia --juvia-url http://juvia.phusion.nl --juvia-site-key #{juvia_site_key}"
-               end
--              sh(command)
-+              #sh(command)
-       end
-       
-       task :clean do

diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 8154e67..36a2f77 100644 (file)
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -61,9 +61,6 @@ Patch107:       rubygem-passenger-4.0.18-GLIBC_HAVE_LONG_LONG.patch
 # Until rubygem-bluecloth is in Fedora, don't use it
 Patch201:       rubygem-passenger-4.0.18-correct_docs.patch
 
-# mizuho doesn't work on RHEL 6 anymore
-Patch202:       rubygem-passenger-disable-mizuho.patch
-
 Requires: rubygems
 # XXX: Needed to run passenger standalone
 Requires: rubygem(daemon_controller) >= 1.0.0
@@ -100,6 +97,7 @@ BuildRequires: ruby
 BuildRequires: ruby-devel
 BuildRequires: rubygems
 BuildRequires: rubygems-devel
+BuildRequires: rubygem(mizuho)
 BuildRequires: rubygem(rake) >= 0.8.1
 BuildRequires: rubygem(rack)
 BuildRequires: rubygem(rspec)
@@ -195,9 +193,6 @@ rebuilding this package.
 # Until bluecloth is in Fedora, don't use it
 %patch201 -p1 -b .docs
 
-# No mizuho on EPEL 6
-%patch202 -p0 -b .mizuho
-
 # Don't use bundled libev
 %{__rm} -rf ext/libev
 
@@ -222,6 +217,10 @@ for script in `find . -type f ! -perm /a+x -name "*.rb"`; do
     [ ! -z "`head -n 1 $script | grep \"^#!/\"`" ] && chmod -v 755 $script
 done
 
+# Incompatibility of nokogiri with asciidoc in EPEL 6
+# (dirty hack)
+sed -i 's/\s*=\+$//' doc/*.txt
+
 
 %build
 export USE_VENDORED_LIBEV=false