From 8f90c77114d2bac03443b25d509b6eaea9151de5 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Fri, 5 Sep 2014 07:59:22 +0200 Subject: [PATCH] - fixed internal and external search paths - package all required files - rel 1 --- dirs.patch | 21 +++++++++++++++++++++ passenger.spec | 25 ++++++++++++++++--------- 2 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 dirs.patch diff --git a/dirs.patch b/dirs.patch new file mode 100644 index 0000000..fef7d15 --- /dev/null +++ b/dirs.patch @@ -0,0 +1,21 @@ +--- passenger-release-4.0.50/ext/common/ResourceLocator.h~ 2014-08-26 16:15:57.000000000 +0200 ++++ passenger-release-4.0.50/ext/common/ResourceLocator.h 2014-09-04 21:47:26.617938160 +0200 +@@ -78,12 +78,12 @@ + } else { + string root = rootOrFile; + binDir = root + "/bin"; +- agentsDir = root + "/buildout/agents"; +- helperScriptsDir = root + "/helper-scripts"; +- resourcesDir = root + "/resources"; +- docDir = root + "/doc"; +- rubyLibDir = root + "/lib"; +- nodeLibDir = root + "/node_lib"; ++ agentsDir = root + "/@@LIB@@/phusion-passenger/agents"; ++ helperScriptsDir = root + "/share/phusion-passenger/helper-scripts"; ++ resourcesDir = root + "/share/phusion-passenger/resources"; ++ docDir = root + "/share/doc"; ++ rubyLibDir = root + "@@RUBYLIBDIR@@"; ++ nodeLibDir = root + "/share/phusion-passenger/node_lib"; + } + } + diff --git a/passenger.spec b/passenger.spec index 9bbd3bf..b3f208d 100644 --- a/passenger.spec +++ b/passenger.spec @@ -4,7 +4,7 @@ Summary: A module to bridge Ruby on Rails to Apache Name: passenger Version: 4.0.50 -Release: 0.1 +Release: 1 # Passenger code uses MIT license. # Bundled(Boost) uses Boost Software License # BCrypt and Blowfish files use BSD license. @@ -15,10 +15,8 @@ Group: Networking/Daemons/HTTP Source0: https://github.com/phusion/passenger/archive/release-%{version}.tar.gz # Source0-md5: 69c6ade41d870782ae12c3f49d79ce20 Source1: apache-mod_%{name}.conf -Patch0: nogems.patch -Patch1: alias+public.patch -Patch2: %{name}_apache_fix_autofoo.patch -Patch3: progs.patch +Patch0: alias+public.patch +Patch1: dirs.patch URL: https://www.phusionpassenger.com/ BuildRequires: apache-devel >= 2.0.55-1 BuildRequires: apache-tools @@ -59,6 +57,7 @@ Group: Daemons Requires: %{name} = %{version}-%{release} Requires: apache(modules-api) = %apache_modules_api Provides: apache(mod_passenger) +Provides: apache(mod_rails) Obsoletes: apache-mod_rails < 4.0 %description -n apache-mod_passenger @@ -81,9 +80,12 @@ Dokumentacji w formacie ri dla Phusion Passenger %prep %setup -q -n %{name}-release-%{version} #%patch0 -p1 -#%patch1 -p0 -#%patch2 -p0 -#%patch3 -p1 +%patch1 -p1 + +__rubydir=$(echo %{ruby_vendorlibdir} | %{__sed} -e 's|/usr||') + +%{__sed} -i -e "s|@@LIB@@|%{_lib}|g" \ + -e "s|@@RUBYLIBDIR@@|$__rubydir|g" ext/common/ResourceLocator.h %{__sed} -i -e 's|#!/usr/bin/env python|#!%{_bindir}/python|' helper-scripts/*.py %{__sed} -i -e 's|#!/usr/bin/env ruby|#!%{_bindir}/ruby|' helper-scripts/{prespawn,download_binaries/extconf.rb,*.rb} bin/* @@ -145,8 +147,9 @@ install -p buildout/ruby/ruby-*/passenger_native_support.so $RPM_BUILD_ROOT%{rub cp -a lib/* $RPM_BUILD_ROOT%{ruby_vendorlibdir} install -p bin/passenger-{config,memory-stats,status} bin/passenger $RPM_BUILD_ROOT%{_bindir} -install -p buildout/agents/{PassengerLoggingAgent,PassengerWatchdog,PassengerHelperAgent} $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents +install -p buildout/agents/{PassengerLoggingAgent,PassengerWatchdog,PassengerHelperAgent,SpawnPreparer,TempDirToucher} $RPM_BUILD_ROOT%{_libdir}/phusion-passenger/agents cp -a helper-scripts/* $RPM_BUILD_ROOT%{_datadir}/phusion-passenger/helper-scripts +cp -a resources node_lib $RPM_BUILD_ROOT%{_datadir}/phusion-passenger/ cp -p man/*.1 $RPM_BUILD_ROOT%{_mandir}/man1 cp -p man/*.8 $RPM_BUILD_ROOT%{_mandir}/man8 @@ -183,9 +186,13 @@ fi %attr(755,root,root) %{_libdir}/phusion-passenger/agents/PassengerHelperAgent %attr(755,root,root) %{_libdir}/phusion-passenger/agents/PassengerLoggingAgent %attr(755,root,root) %{_libdir}/phusion-passenger/agents/PassengerWatchdog +%attr(755,root,root) %{_libdir}/phusion-passenger/agents/SpawnPreparer +%attr(755,root,root) %{_libdir}/phusion-passenger/agents/TempDirToucher %dir %{_datadir}/phusion-passenger %dir %{_datadir}/phusion-passenger/helper-scripts %attr(755,root,root) %{_datadir}/phusion-passenger/helper-scripts/* +%{_datadir}/phusion-passenger/resources +%{_datadir}/phusion-passenger/node_lib %files -n apache-mod_passenger %defattr(644,root,root,755) -- 2.43.0