- rel 3

[packages/passenger.git] / apache-mod_rails.spec

diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec
index f09e8753b7e463d2183748ebdcebc904b1e1658f..70f403cf3156e13b39786fbbeefcabd582eb534c 100644 (file)
--- a/apache-mod_rails.spec
+++ b/apache-mod_rails.spec
@@ -11,34 +11,36 @@
 
 Summary:       A module to bridge Ruby on Rails to Apache
 Name:          apache-mod_rails
-Version:       3.0.5
-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: 1cbdd6bf0603658c089c74e7cc3d1b16
+# Source0-md5: c0cafef2c5ba522310602f451ea4c941
 Source1:       %{name}.conf
 Patch0:                %{name}-nogems.patch
 Patch1:                %{name}-alias+public.patch
-Patch2:                %{name}-cstdio.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
@@ -47,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
@@ -74,11 +64,10 @@ Dokumentacji w formacie ri dla Apache mod_rails.
 %prep
 %setup -q -c
 %{__tar} xf %{SOURCE0} -O data.tar.gz | %{__tar} xz
-find -newer README -o -print | xargs touch --reference %{SOURCE0}
+find -newer README -o -print0 | xargs -0 touch --reference %{SOURCE0}
 %patch0 -p1
 %patch1 -p0
 %patch2 -p1
-%patch3 -p1
 
 %{__sed} -i -e 's!/usr/lib/!%{_libdir}/!g' ext/common/ResourceLocator.h
 
@@ -94,9 +83,6 @@ rake apache2 \
        CXX=%{__cxx} \
        CC=%{__cc}
 
-# No need to rebuild rdoc/txt/html
-#rake doc
-
 rdoc --ri --op ri lib ext/ruby
 %{__rm} -r ri/{ConditionVariable,Exception,GC,IO,Object,Process,Signal}
 %{__rm} ri/{cache.ri,created.rid}
@@ -104,9 +90,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
 
@@ -126,11 +111,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
 
@@ -148,8 +140,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
@@ -164,10 +156,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