From 2423fa08d85953a22a7eac186f868304de90d96e Mon Sep 17 00:00:00 2001
From: =?utf8?q?Elan=20Ruusam=C3=A4e?= <glen@delfi.ee>
Date: Wed, 1 May 2013 22:25:10 +0300
Subject: [PATCH] update deps, do not depend on httpd server for build

---
 apache-mod_rails.spec | 19 +++++++------------
 progs.patch           | 22 ++++++++++++++++++++++
 2 files changed, 29 insertions(+), 12 deletions(-)
 create mode 100644 progs.patch

diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec
index abe5122..26b66fb 100644
--- a/apache-mod_rails.spec
+++ b/apache-mod_rails.spec
@@ -6,7 +6,7 @@
 Summary:	A module to bridge Ruby on Rails to Apache
 Name:		apache-mod_rails
 Version:	3.0.19
-Release:	0.3
+Release:	0.4
 # Passenger code uses MIT license.
 # Bundled(Boost) uses Boost Software License
 # BCrypt and Blowfish files use BSD license.
@@ -19,10 +19,9 @@ Source1:	%{name}.conf
 Patch0:		%{name}-nogems.patch
 Patch1:		%{name}-alias+public.patch
 Patch2:		passenger_apache_fix_autofoo.patch
+Patch3:		progs.patch
 URL:		http://www.modrails.com/
-BuildRequires:	apache-base >= 2.0.55-1
 BuildRequires:	apache-devel >= 2.0.55-1
-BuildRequires:	apache-tools >= 2.0.55-1
 BuildRequires:	apr-devel >= 1:1.0.0
 BuildRequires:	apr-util-devel >= 1:1.0.0
 #BuildRequires:	asciidoc
@@ -30,11 +29,11 @@ BuildRequires:	curl-devel
 BuildRequires:	libev-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
-BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.559
 BuildRequires:	ruby-devel
 BuildRequires:	ruby-rake >= 0.8.0
+BuildRequires:	ruby-rdoc
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
 %requires_ge_to	ruby ruby-devel
@@ -70,24 +69,20 @@ Dokumentacji w formacie ri dla Apache mod_rails.
 %patch0 -p1
 %patch1 -p0
 %patch2 -p0
+%patch3 -p1
 
 # Don't use bundled libev
 rm -r ext/libev
 
 %build
-
-cat > fake-httpd <<EOF
-#!/bin/sh
-echo Apache/$(rpm -q apache-devel --qf '%{V}')
-EOF
-chmod a+rx fake-httpd
-
 USE_VENDORED_LIBEV=false \
 rake apache2 V=1 \
 	RELEASE=yes \
 	OPTIMIZE=yes \
-	HTTPD=${PWD:-$(pwd)/fake-httpd} \
+	APACHECTL=%{_sbindir}/apachectl \
 	APXS2=%{apxs} \
+	HTTPD=foo \
+	HTTPD_VERSION=$(rpm -q apache-devel --qf '%{V}') \
 	CC="%{__cc}" \
 	CXX="%{__cxx}" \
 	CFLAGS="%{rpmcflags}" \
diff --git a/progs.patch b/progs.patch
new file mode 100644
index 0000000..38cb010
--- /dev/null
+++ b/progs.patch
@@ -0,0 +1,22 @@
+--- passenger-release-3.0.19/lib/phusion_passenger/platform_info/apache.rb~	2012-12-20 14:23:00.000000000 +0200
++++ passenger-release-3.0.19/lib/phusion_passenger/platform_info/apache.rb	2013-05-01 22:05:55.625131364 +0300
+@@ -58,6 +58,9 @@
+ 	# The absolute path to the 'apachectl' or 'apache2ctl' binary, or nil if
+ 	# not found.
+ 	def self.apache2ctl
++		if env_defined?("APACHECTL")
++			return ENV["APACHECTL"]
++		end
+ 		return find_apache2_executable('apache2ctl', 'apachectl2', 'apachectl')
+ 	end
+ 	memoize :apache2ctl
+@@ -83,6 +86,9 @@
+ 
+ 	# The Apache version, or nil if Apache is not found.
+ 	def self.httpd_version
++		if env_defined?("HTTPD_VERSION")
++			return ENV["HTTPD_VERSION"]
++		end
+ 		if httpd
+ 			`#{httpd} -v` =~ %r{Apache/([\d\.]+)}
+ 			return $1
-- 
2.44.0