From 6cb57b652795d50705758a73aaaa3947c2783031 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bart=C5=82omiej=20Zimo=C5=84?= <cactus@pld-linux.org>
Date: Wed, 4 Jun 2008 16:21:55 +0000
Subject: [PATCH] - up to 1.0.5 - updated TODO - now works w/o patch but need
 to find different sollution to pass cflags of apr-util-1 to CPPFLAGS - BR:
 apache-base, apache-tools, pkgconfig, ruby-RubyGems, sed - adapter

Changed files:
    apache-mod_rails.spec -> 1.2
---
 apache-mod_rails.spec | 32 ++++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 10 deletions(-)

diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec
index 8236dd7..cb19a39 100644
--- a/apache-mod_rails.spec
+++ b/apache-mod_rails.spec
@@ -1,29 +1,38 @@
+#
+# TODO:
+# - separate -devel with ExtUtils::Embed and friends?
+# - how to pass CXXFLAGS to Rakefile?
+
 %define		apxs	/usr/sbin/apxs
 %define		mod_name	rails
+%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+
 Summary:	A module to bridge Ruby on Rails to Apache
 Name:		apache-mod_rails
-Version:	1.0.1
+Version:	1.0.5
 Release:	1
 License:	Apache
 Group:		Networking/Daemons
-Source0:	http://rubyforge.org/frs/download.php/35309/passenger-%{version}.tar.gz
-# Source0-md5:	82df07de03c4d57bc2dfc6393bcb7687
+Source0:	http://rubyforge.org/frs/download.php/36739/passenger-%{version}.tar.gz
+# Source0-md5:	28cf289ae1d0fa93cd077deedca35e76
 #Source1:	%{name}.conf
-Patch0:		%{name}-buildfix.patch
+#Patch0: %{name}-buildfix.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-util-devel >= 1:1.0.0
+BuildRequires:	pkgconfig
 BuildRequires:	rake
 BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	ruby-RubyGems
 BuildRequires:	ruby-devel
+BuildRequires:	sed >= 4.0
 BuildRequires:	setup.rb
 Provides:	apache(mod_rails)
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-# TODO: separate -devel with ExtUtils::Embed and friends?
-%define		apacheconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
-%define		apachelibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
-
 %description
 Phusion Passenger — a.k.a. mod_rails — makes deployment of
 applications built on the revolutionary Ruby on Rails web framework a
@@ -32,7 +41,10 @@ breeze. It follows the usual Ruby on Rails conventions, such as
 
 %prep
 %setup -q -n passenger-%{version}
-%patch0 -p1
+#%patch0 -p1
+
+# TODO : ugly metod - but works
+%{__sed} -i 's/CXXFLAGS = "/CXXFLAGS = "`pkg-config --cflags apr-util-1`/ ' Rakefile
 
 %build
 cp %{_datadir}/setup.rb .
@@ -65,5 +77,5 @@ fi
 %doc INSTALL README
 #%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*.conf
 %attr(755,root,root) %{apachelibdir}/*.so
-%attr(755,root,root) %{_bindir}/passenger-spawn-server
+%attr(755,root,root) %{_bindir}/passenger-*
 %{ruby_rubylibdir}/passenger
-- 
2.43.0