[rubygem-passenger] Fix to make agents work on F19+
tdawson
tdawson at fedoraproject.org
Thu May 16 21:46:07 UTC 2013
commit 1403014e5de7454e3ebff41cda501bcb8d576cea
Author: Troy Dawson <tdawson at redhat.com>
Date: Thu May 16 16:46:03 2013 -0500
Fix to make agents work on F19+
rubygem-passenger.spec | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/rubygem-passenger.spec b/rubygem-passenger.spec
index 9994e74..abd2e42 100644
--- a/rubygem-passenger.spec
+++ b/rubygem-passenger.spec
@@ -7,7 +7,7 @@
Summary: Passenger Ruby web application server
Name: rubygem-%{gem_name}
Version: 3.0.19
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Daemons
# Passenger code uses MIT license.
# Bundled(Boost) uses Boost Software License
@@ -193,7 +193,7 @@ rebuilding this package.
%{__sed} -i \
-e 's|%%%%GEM_INSTALL_DIR%%%%|%{gem_instdir}|g' \
-e 's|%%%%APACHE_INSTALLED_MOD%%%%|%{_libdir}/httpd/modules/|g' \
- -e 's|%%%%AGENTS_DIR%%%%|%{gem_extdir}/agents|g' \
+ -e 's|%%%%AGENTS_DIR%%%%|%{gem_instdir}/agents|g' \
-e 's|%%%%NATIVE_SUPPORT_DIR%%%%|%{gem_extdir}/lib|g' \
lib/phusion_passenger.rb \
lib/phusion_passenger/native_support.rb \
@@ -249,8 +249,8 @@ rmdir %{buildroot}%{gem_instdir}/man
# The agents aren't in the gem for some reason...
%{__chmod} -R 0755 agents/*
-%{__mkdir_p} %{buildroot}%{gem_extdir}
-%{__cp} -a agents %{buildroot}%{gem_extdir}
+%{__mkdir_p} %{buildroot}%{gem_instdir}
+%{__cp} -a agents %{buildroot}%{gem_instdir}
# Make our ghost log and run directories...
%{__mkdir_p} %{buildroot}%{_localstatedir}/log/passenger-analytics
@@ -350,7 +350,7 @@ rake test --trace ||:
%{_libdir}/httpd/modules/mod_passenger.so
%files native
-%{gem_extdir}/agents
+%{gem_instdir}/agents
%dir %{_localstatedir}/log/passenger-analytics
%{_sysconfdir}/logrotate.d/passenger
@@ -359,6 +359,9 @@ rake test --trace ||:
%{gem_extdir}/lib
%changelog
+* Thu May 16 2013 Troy Dawson <tdawson at redhat.com> - 3.0.19-4
+- Fix to make agents work on F19+
+
* Wed Mar 13 2013 Troy Dawson <tdawson at redhat.com> - 3.0.19-3
- Fix to make it build/install on F19+
- Added patch105
More information about the scm-commits
mailing list