packages: apache-mod_rails/apache-mod_rails.spec - don't list files twice -...

baggins baggins at pld-linux.org
Mon Oct 10 22:19:24 CEST 2011


Author: baggins                      Date: Mon Oct 10 20:19:24 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- don't list files twice
- get rid of the /usr/bin/env shebang

---- Files affected:
packages/apache-mod_rails:
   apache-mod_rails.spec (1.25 -> 1.26) 

---- Diffs:

================================================================
Index: packages/apache-mod_rails/apache-mod_rails.spec
diff -u packages/apache-mod_rails/apache-mod_rails.spec:1.25 packages/apache-mod_rails/apache-mod_rails.spec:1.26
--- packages/apache-mod_rails/apache-mod_rails.spec:1.25	Mon Oct 10 22:10:26 2011
+++ packages/apache-mod_rails/apache-mod_rails.spec	Mon Oct 10 22:19:19 2011
@@ -115,6 +115,14 @@
 
 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
 
@@ -132,8 +140,8 @@
 %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
@@ -158,6 +166,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.26  2011/10/10 20:19:19  baggins
+- don't list files twice
+- get rid of the /usr/bin/env shebang
+
 Revision 1.25  2011/10/10 20:10:26  baggins
 - 3.0.9
 - rdoc documentation is totally gone this time
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/apache-mod_rails/apache-mod_rails.spec?r1=1.25&r2=1.26&f=u



More information about the pld-cvs-commit mailing list