X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_rails.spec;h=26b66fb6381686687f03447d0a3f69f9dde803a3;hb=2423fa08d85953a22a7eac186f868304de90d96e;hp=0de97bcac7026b163095273057f7164136deb20f;hpb=a13194e763c4955655df139fbe8a7089153514fd;p=packages%2Fpassenger.git diff --git a/apache-mod_rails.spec b/apache-mod_rails.spec index 0de97bc..26b66fb 100644 --- a/apache-mod_rails.spec +++ b/apache-mod_rails.spec @@ -2,46 +2,50 @@ # TODO: # - separate -devel with ExtUtils::Embed and friends? -%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) -%define apacheprefix %(%{apxs} -q PREFIX 2>/dev/null) -%define apachelibdir2 %(%{apxs} -q LIBEXECDIR 2>/dev/null | %{__sed} 's|%{apacheprefix}||') - +%define gem_name passenger Summary: A module to bridge Ruby on Rails to Apache Name: apache-mod_rails -Version: 3.0.11 -Release: 2 -License: Apache +Version: 3.0.19 +Release: 0.4 +# Passenger code uses MIT license. +# Bundled(Boost) uses Boost Software License +# BCrypt and Blowfish files use BSD license. +# Documentation is CC-BY-SA +# See: https://bugzilla.redhat.com/show_bug.cgi?id=470696#c146 +License: Boost and BSD and BSD with advertising and MIT and zlib Group: Networking/Daemons/HTTP -Source0: http://rubygems.org/downloads/passenger-%{version}.gem -# Source0-md5: c0cafef2c5ba522310602f451ea4c941 +Source0: https://github.com/FooBarWidget/passenger/archive/release-%{version}.tar.gz Source1: %{name}.conf Patch0: %{name}-nogems.patch Patch1: %{name}-alias+public.patch -Patch2: %{name}-build.patch -URL: http://www.modrails.com -BuildRequires: apache-base >= 2.0.55-1 +Patch2: passenger_apache_fix_autofoo.patch +Patch3: progs.patch +URL: http://www.modrails.com/ 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: libev-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: ruby-rdoc BuildRequires: sed >= 4.0 BuildRequires: zlib-devel +%requires_ge_to ruby ruby-devel +Requires: apache(modules-api) = %apache_modules_api Provides: apache(mod_rails) Obsoletes: apache-mod_rails-rdoc BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) +%define apxs /usr/sbin/apxs +%define _pkglibdir %(%{apxs} -q LIBEXECDIR 2>/dev/null) +%define _sysconfdir %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d + %description Phusion Passenger — a.k.a. mod_rails — makes deployment of applications built on the revolutionary Ruby on Rails web framework a @@ -61,26 +65,28 @@ ri documentation for Apache mod_rails. 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 -print0 | xargs -0 touch --reference %{SOURCE0} +%setup -q -n %{gem_name}-release-%{version} %patch0 -p1 %patch1 -p0 -%patch2 -p1 +%patch2 -p0 +%patch3 -p1 -%{__sed} -i -e 's!/usr/lib/!%{_libdir}/!g' ext/common/ResourceLocator.h +# Don't use bundled libev +rm -r ext/libev %build -(cd ext/libev ; %{__autoconf}) - -rake apache2 \ +USE_VENDORED_LIBEV=false \ +rake apache2 V=1 \ RELEASE=yes \ OPTIMIZE=yes \ + APACHECTL=%{_sbindir}/apachectl \ APXS2=%{apxs} \ - CXXFLAGS="%{rpmcxxflags}" \ + HTTPD=foo \ + HTTPD_VERSION=$(rpm -q apache-devel --qf '%{V}') \ + CC="%{__cc}" \ + CXX="%{__cxx}" \ CFLAGS="%{rpmcflags}" \ - CXX=%{__cxx} \ - CC=%{__cc} + CXXFLAGS="%{rpmcxxflags}" rdoc --ri --op ri lib ext/ruby %{__rm} -r ri/{ConditionVariable,Exception,GC,IO,Object,Process,Signal} @@ -88,31 +94,23 @@ 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_archdir},%{ruby_ridir}} \ +install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},%{_mandir}/man{1,8}} \ + $RPM_BUILD_ROOT{%{ruby_vendorlibdir},%{ruby_vendorarchdir},%{ruby_ridir}} \ $RPM_BUILD_ROOT%{_bindir} \ $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents/apache2 \ $RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts -install ext/apache2/mod_passenger.so $RPM_BUILD_ROOT%{apachelibdir} - -install ext/ruby/ruby-*/passenger_native_support.so $RPM_BUILD_ROOT%{ruby_archdir} - -install bin/passenger-{config,make-enterprisey,memory-stats,status} bin/passenger \ - $RPM_BUILD_ROOT%{_bindir} - -install agents/PassengerLoggingAgent agents/PassengerWatchdog $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents -install agents/apache2/PassengerHelperAgent $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents/apache2 - -install helper-scripts/* $RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts - -cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir} -install man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 -install man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8 - +install -p ext/apache2/mod_passenger.so $RPM_BUILD_ROOT%{_pkglibdir} +install -p ext/ruby/ruby-*/passenger_native_support.so $RPM_BUILD_ROOT%{ruby_vendorarchdir} +install -p bin/passenger-{config,memory-stats,status} bin/passenger $RPM_BUILD_ROOT%{_bindir} +install -p agents/PassengerLoggingAgent agents/PassengerWatchdog $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents +install -p agents/apache2/PassengerHelperAgent $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents/apache2 +install -p helper-scripts/* $RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts +cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir} +cp -p man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 +cp -p man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8 cp -a ri/* $RPM_BUILD_ROOT%{ruby_ridir} - -install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_rails.conf +cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/75_mod_rails.conf %{__sed} -i -e 's|#!/usr/bin/env ruby|#!%{_bindir}/ruby|' \ $RPM_BUILD_ROOT%{_bindir}/passenger \ @@ -120,7 +118,7 @@ install %{SOURCE1} $RPM_BUILD_ROOT%{apacheconfdir}/75_mod_rails.conf $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 + $RPM_BUILD_ROOT%{ruby_vendorlibdir}/phusion_passenger/wsgi/request_handler.py %clean rm -rf $RPM_BUILD_ROOT @@ -135,25 +133,33 @@ fi %files %defattr(644,root,root,755) -%doc INSTALL README doc/{A*.txt,Security*.txt,*Apache.txt} -%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}/* +%doc INSTALL README +#%doc doc/{A*.txt,Security*.txt,*Apache.txt} +#%doc doc/{A*.html,Security*.html,*Apache.html,images} +%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_rails.conf +%attr(755,root,root) %{_pkglibdir}/mod_passenger.so %attr(755,root,root) %{_bindir}/passenger -%attr(755,root,root) %{_bindir}/passenger-* -%attr(755,root,root) %{ruby_archdir}/*.so +%attr(755,root,root) %{_bindir}/passenger-config +%attr(755,root,root) %{_bindir}/passenger-memory-stats +%attr(755,root,root) %{_bindir}/passenger-status +%{_mandir}/man1/passenger-config.1* +%{_mandir}/man1/passenger-stress-test.1* +%{_mandir}/man8/passenger-memory-stats.8* +%{_mandir}/man8/passenger-status.8* + +%attr(755,root,root) %{ruby_vendorarchdir}/passenger_native_support.so +%{ruby_vendorlibdir}/phusion_passenger.rb +%{ruby_vendorlibdir}/phusion_passenger + %dir %{_libdir}/phusion-passenger %dir %{_libdir}/phusion-passenger/agents -%attr(755,root,root) %{_libdir}/phusion-passenger/agents/Passenger* +%attr(755,root,root) %{_libdir}/phusion-passenger/agents/PassengerLoggingAgent +%attr(755,root,root) %{_libdir}/phusion-passenger/agents/PassengerWatchdog %dir %{_libdir}/phusion-passenger/agents/apache2 %attr(755,root,root) %{_libdir}/phusion-passenger/agents/apache2/Passenger* -%{ruby_rubylibdir}/phusion_passenger -%{ruby_rubylibdir}/phusion_passenger.rb %dir %{_datadir}/phusion-passenger %dir %{_datadir}/phusion-passenger/helper-scripts %attr(755,root,root) %{_datadir}/phusion-passenger/helper-scripts/* -%{_mandir}/man1/* -%{_mandir}/man8/* %files ri %defattr(644,root,root,755)