Changes - j0ke.net Open Build Service

Changes of Revision 3

[-] [+]	Changed	rubygem-passenger.spec
@@ -17,7 +17,7 @@ Name: rubygem-passenger -Version: 3.0.17 +Version: 3.0.19 Release: 0 %define mod_name passenger %define mod_full_name %{mod_name}-%{version} @@ -44,8 +44,8 @@ BuildRequires: apache2-devel BuildRequires: boost-devel BuildRequires: gcc-c++ -Requires: ruby >= 1.8.7 -BuildRequires: ruby-devel >= 1.8.7 +Requires: ruby19 +BuildRequires: ruby19-devel BuildRequires: rubygem-rack-1 > 1.0 %if 0%{?suse_version} >= 1110 BuildRequires: libcurl-devel @@ -59,7 +59,7 @@ Recommends: packageand(nginx:rubygem-passenger-nginx) # Url: http://www.modrails.com/ -Source: %{mod_full_name}.gem +Source0: %{mod_full_name}.gem # patches are just in for the case i find time to forward port them. # atm we use the static boost library that ships with passenger Source1: rubygem-passenger-2.0.5_system_boost.patch @@ -75,6 +75,7 @@ Summary: Easy and robust Ruby web application deployment License: MIT and GPL-2.0 Group: Development/Languages/Ruby +%define rb_ver %{rb19_ver} %description Easy and robust Ruby web application deployment. @@ -134,17 +135,17 @@ %if 0%{?use_system_libev} export USE_VENDORED_LIBEV="no" %endif -%gem_install %{S:0} +%gem19_install %{S:0} pushd %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ export PATH="%{_sbindir}:$PATH" patch -p0 --fuzz=0 -i %{S:11} #compiling nginx stuff patch -p0 --fuzz=0 -i %{S:10} - rake nginx:clean nginx CACHING=no + rake1.9 nginx:clean nginx CACHING=no #compiling apache2 stuff - rake apache2 + rake1.9 apache2 %{__install} -D -m 0755 ext/apache2/mod_passenger.so %{buildroot}%{apache_libexecdir}/mod_passenger.so # cleanup %if ! 0%{?use_system_libev} @@ -155,7 +156,7 @@ mv -v ext/ruby//passenger_native_support.so lib/ rm -rv ext/ruby/ruby--linux popd -%gem_cleanup +%gem19_cleanup find %{buildroot}%{_libdir}/ruby/gems/%{rb_ver}/gems/%{mod_full_name}/ -name dispatch.\* -print0 \| \ xargs -r0 ruby -p -i -e 'gsub(%r{#!./bin/ruby.}, "#!/usr/bin/ruby")' %{__install} -D -m 0644 %{S:4} %{buildroot}%{apache_sysconfdir}/conf.d/mod_passenger.conf