Update the documentation patch for 4.0.55.
authorFrantišek Dvořák <valtri@civ.zcu.cz>
Wed, 17 Dec 2014 15:47:30 +0000 (16:47 +0100)
committerFrantišek Dvořák <valtri@civ.zcu.cz>
Wed, 17 Dec 2014 16:05:54 +0000 (17:05 +0100)
rubygem-passenger-4.0.18-correct_docs.patch [deleted file]
rubygem-passenger-4.0.55-correct_docs.patch [new file with mode: 0644]
rubygem-passenger.spec

diff --git a/rubygem-passenger-4.0.18-correct_docs.patch b/rubygem-passenger-4.0.18-correct_docs.patch
deleted file mode 100644 (file)
index dd98a5b..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urp passenger-release-4.0.18.orig/lib/phusion_passenger/packaging.rb passenger-release-4.0.18/lib/phusion_passenger/packaging.rb
---- passenger-release-4.0.18.orig/lib/phusion_passenger/packaging.rb   2013-09-17 13:47:54.000000000 -0500
-+++ passenger-release-4.0.18/lib/phusion_passenger/packaging.rb        2013-09-24 14:42:54.126310781 -0500
-@@ -36,7 +36,7 @@ module Packaging
-       # Files that must be generated before packaging.
-       PREGENERATED_FILES = [
-               'ext/common/Constants.h',
--              'doc/Packaging.html'
-+              'doc/Packaging.txt.md'
-       ] + ASCII_DOCS
-       
-       USER_EXECUTABLES = [
diff --git a/rubygem-passenger-4.0.55-correct_docs.patch b/rubygem-passenger-4.0.55-correct_docs.patch
new file mode 100644 (file)
index 0000000..03814f6
--- /dev/null
@@ -0,0 +1,19 @@
+commit 9750f349a7c59ded78cdec8aa0d7bbdbc60e7073
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date:   Wed Dec 17 16:42:57 2014 +0100
+
+    Correct build of the documentation.
+
+diff --git a/lib/phusion_passenger/packaging.rb b/lib/phusion_passenger/packaging.rb
+index 8109c1b..1dfe62e 100644
+--- a/lib/phusion_passenger/packaging.rb
++++ b/lib/phusion_passenger/packaging.rb
+@@ -37,7 +37,7 @@ module Packaging
+       # Files that must be generated before packaging.
+       PREGENERATED_FILES = [
+               'ext/common/Constants.h',
+-              'doc/Packaging.html',
++              'doc/Packaging.txt.md',
+               'doc/CloudLicensingConfiguration.html'
+       ] + ASCII_DOCS
index 7dc0779..8696c04 100644 (file)
@@ -22,7 +22,7 @@
 
 Summary: Passenger Ruby web application server
 Name: rubygem-%{gem_name}
-Version: 4.0.45
+Version: 4.0.55
 Release: 1%{?dist}
 Group: System Environment/Daemons
 # Passenger code uses MIT license.
@@ -59,7 +59,7 @@ Patch104:       rubygem-passenger-4.0.18_remove_fastthread_dep.patch
 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
+Patch201:       rubygem-passenger-4.0.55-correct_docs.patch
 
 Requires: rubygems
 # XXX: Needed to run passenger standalone