X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_rails.spec;h=8004fddf28a92a21bf86dc2041640134c2648af6;hb=cc9778171f314018f1acf155053b3283d11c7834;hp=74a109893800f16224236dc5660d3374c50987dd;hpb=52709cd5b16f7ced7ec76973c7b250c0f6eb4045;p=packages%2Fpassenger.git

diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec
index 74a1098..8004fdd 100644
--- a/apache-mod_rails.spec
+++ b/apache-mod_rails.spec
@@ -11,33 +11,36 @@
 
 Summary:	A module to bridge Ruby on Rails to Apache
 Name:		apache-mod_rails
-Version:	3.0.6
-Release:	0.1
+Version:	3.0.11
+Release:	3
 License:	Apache
 Group:		Networking/Daemons/HTTP
 Source0:	http://rubygems.org/downloads/passenger-%{version}.gem
-# Source0-md5:	2110a38db4b91603eca0616b9ce7bb5f
+# Source0-md5:	c0cafef2c5ba522310602f451ea4c941
 Source1:	%{name}.conf
 Patch0:		%{name}-nogems.patch
 Patch1:		%{name}-alias+public.patch
-Patch3:		%{name}-build.patch
+Patch2:		%{name}-build.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
 BuildRequires:	curl-devel
 BuildRequires:	libstdc++-devel
 BuildRequires:	openssl-devel
 BuildRequires:	pkgconfig
 BuildRequires:	rpm-pythonprov
-BuildRequires:	rpmbuild(macros) >= 1.268
+BuildRequires:	rpmbuild(macros) >= 1.559
 BuildRequires:	ruby-devel
 BuildRequires:	ruby-rake >= 0.8.0
 BuildRequires:	sed >= 4.0
 BuildRequires:	zlib-devel
+%requires_ge_to	ruby ruby-devel
 Provides:	apache(mod_rails)
+Obsoletes:	apache-mod_rails-rdoc
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -46,18 +49,6 @@ applications built on the revolutionary Ruby on Rails web framework a
 breeze. It follows the usual Ruby on Rails conventions, such as
 "Don’t-Repeat-Yourself".
 
-%package rdoc
-Summary:	HTML documentation for Apache mod_rails
-Summary(pl.UTF-8):	Dokumentacja w formacie HTML dla Apache mod_rails
-Group:		Documentation
-Requires:	ruby >= 1:1.8.7-4
-
-%description rdoc
-HTML documentation for Apache mod_rails.
-
-%description rdoc -l pl.UTF-8
-Dokumentacja w formacie HTML dla Apache mod_rails.
-
 %package ri
 Summary:	ri documentation for Apache mod_rails
 Summary(pl.UTF-8):	Dokumentacja w formacie ri dla Apache mod_rails
@@ -76,23 +67,23 @@ Dokumentacji w formacie ri dla Apache mod_rails.
 find -newer README -o -print0 | xargs -0 touch --reference %{SOURCE0}
 %patch0 -p1
 %patch1 -p0
-%patch3 -p1
+%patch2 -p1
 
 %{__sed} -i -e 's!/usr/lib/!%{_libdir}/!g' ext/common/ResourceLocator.h
 
 %build
-(cd ext/libev ; %{__autoconf})
+(cd ext/libev; %{__autoconf})
 
+cc="%{__cc}"; cc=${cc#ccache }
+cxx="%{__cxx}"; cxx=${cxx#ccache }
 rake apache2 \
 	RELEASE=yes \
 	OPTIMIZE=yes \
 	APXS2=%{apxs} \
 	CXXFLAGS="%{rpmcxxflags}" \
 	CFLAGS="%{rpmcflags}" \
-	CXX=%{__cxx} \
-	CC=%{__cc}
-
-rake doc
+	CXX="$cxx" \
+	CC="$cc"
 
 rdoc --ri --op ri lib ext/ruby
 %{__rm} -r ri/{ConditionVariable,Exception,GC,IO,Object,Process,Signal}
@@ -101,9 +92,8 @@ rdoc --ri --op ri lib ext/ruby
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{apachelibdir},%{apacheconfdir},%{_mandir}/man{1,8}} \
-	$RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_ridir},%{ruby_rdocdir}} \
+	$RPM_BUILD_ROOT{%{ruby_rubylibdir},%{ruby_archdir},%{ruby_ridir}} \
 	$RPM_BUILD_ROOT%{_bindir} \
-	$RPM_BUILD_ROOT%{ruby_archdir} \
 	$RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents/apache2 \
 	$RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts
 
@@ -123,11 +113,18 @@ cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 install man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1
 install man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8
 
-cp -a doc/rdoc $RPM_BUILD_ROOT%{ruby_rdocdir}/%{name}-%{version}
 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir}
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_rails.conf
 
+%{__sed} -i -e 's|#!/usr/bin/env ruby|#!%{_bindir}/ruby|' \
+	$RPM_BUILD_ROOT%{_bindir}/passenger \
+	$RPM_BUILD_ROOT%{_bindir}/passenger-* \
+	$RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts/*
+
+%{__sed} -i -e 's|#!/usr/bin/env python|#!%{_bindir}/python|' \
+	$RPM_BUILD_ROOT%{ruby_rubylibdir}/phusion_passenger/wsgi/request_handler.py
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -145,8 +142,8 @@ fi
 %doc doc/{A*.html,Security*.html,*Apache.html,images}
 %attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{apacheconfdir}/*.conf
 %attr(755,root,root) %{apachelibdir}/*
+%attr(755,root,root) %{_bindir}/passenger
 %attr(755,root,root) %{_bindir}/passenger-*
-%attr(755,root,root) %{_bindir}/passenger*
 %attr(755,root,root) %{ruby_archdir}/*.so
 %dir %{_libdir}/phusion-passenger
 %dir %{_libdir}/phusion-passenger/agents
@@ -161,10 +158,6 @@ fi
 %{_mandir}/man1/*
 %{_mandir}/man8/*
 
-%files rdoc
-%defattr(644,root,root,755)
-%{ruby_rdocdir}/%{name}-%{version}
-
 %files ri
 %defattr(644,root,root,755)
 %{ruby_ridir}/PhusionPassenger