From a936fcf80a882cc4cb980549372357a3cf8317f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Franti=C5=A1ek=20Dvo=C5=99=C3=A1k?= Date: Thu, 19 Jun 2014 17:49:32 +0200 Subject: [PATCH] Disable mizuho altogether. --- rubygem-passenger-disable-mizuho.patch | 11 +++++++++++ rubygem-passenger.spec | 19 +++++++++++-------- 2 files changed, 22 insertions(+), 8 deletions(-) create mode 100644 rubygem-passenger-disable-mizuho.patch diff --git a/rubygem-passenger-disable-mizuho.patch b/rubygem-passenger-disable-mizuho.patch new file mode 100644 index 0000000..5e75e16 --- /dev/null +++ b/rubygem-passenger-disable-mizuho.patch @@ -0,0 +1,11 @@ +--- 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 5f540ff..5984bb9 100644 --- a/rubygem-passenger.spec +++ b/rubygem-passenger.spec @@ -22,7 +22,7 @@ Summary: Passenger Ruby web application server Name: rubygem-%{gem_name} -Version: 4.0.44 +Version: 4.0.45 Release: 1%{?dist} Group: System Environment/Daemons # Passenger code uses MIT license. @@ -61,6 +61,9 @@ 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 @@ -97,8 +100,6 @@ BuildRequires: ruby BuildRequires: ruby-devel BuildRequires: rubygems BuildRequires: rubygems-devel -# for EPEL6 required special version using html4 backend from asciidoc -BuildRequires: rubygem(mizuho) BuildRequires: rubygem(rake) >= 0.8.1 BuildRequires: rubygem(rack) BuildRequires: rubygem(rspec) @@ -134,7 +135,7 @@ This package contains the pluggable Apache server module for Phusion Passenger Summary: Apache Module for Phusion Passenger Group: System Environment/Daemons Requires: rubygem(%{gem_name}) = %{version}-%{release} -Provides: bundled(boost-devel) = 1.44 +Provides: bundled(boost-devel) = 1.54 License: Boost and BSD and BSD with advertising and GPL+ and MIT and zlib %description devel @@ -194,6 +195,9 @@ 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 @@ -218,10 +222,6 @@ 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 @@ -434,6 +434,9 @@ fi %{gem_extdir}/lib %changelog +* Thu Jun 19 2014 František Dvořák - 4.0.45-1 +- Disable mizuho altogether + * Thu Jun 05 2014 František Dvořák - 4.0.42-1 - Merge master to EPEL 6 - Add neccessary modifications for EPEL 6: -- 1.8.2.3