Author: oden
Date: Mon Feb 12 12:50:03 2007
New Revision: 118931
Added:
packages/cooker/apache-mod_ruby/current/SOURCES/20_mod_ruby.conf
packages/cooker/apache-mod_ruby/current/SOURCES/mod_ruby-1.2.6.tar.gz
(contents, props changed)
Removed:
packages/cooker/apache-mod_ruby/current/SOURCES/20_mod_ruby.conf.bz2
packages/cooker/apache-mod_ruby/current/SOURCES/mod_ruby-1.2.5.tar.bz2
Modified:
packages/cooker/apache-mod_ruby/current/SPECS/apache-mod_ruby.spec
Log:
- 1.2.6
Added: packages/cooker/apache-mod_ruby/current/SOURCES/20_mod_ruby.conf
==============================================================================
--- (empty file)
+++ packages/cooker/apache-mod_ruby/current/SOURCES/20_mod_ruby.conf Mon Feb
12 12:50:03 2007
@@ -0,0 +1,55 @@
+<IfDefine HAVE_RUBY>
+ <IfModule !mod_ruby.c>
+ LoadModule ruby_module extramodules/mod_ruby.so
+ </IfModule>
+</IfDefine>
+
+# taken from the example file
+# If the ruby module is installed, this will be enabled.
+<IfModule mod_ruby.c>
+ # for Apache::RubyRun
+ RubyRequire apache/ruby-run
+
+ # exec files under /ruby as ruby scripts.
+ <Location /ruby>
+ SetHandler ruby-object
+ RubyHandler Apache::RubyRun.instance
+ Options ExecCGI
+ </Location>
+
+ # exec *.rbx as ruby scripts.
+ <Files *.rbx>
+ SetHandler ruby-object
+ RubyHandler Apache::RubyRun.instance
+ </Files>
+
+ # # for Apache::ERubyRun
+ # RubyRequire apache/eruby-run
+ #
+ # # handle files under /eruby as eRuby files by eruby.
+ # <Location /eruby>
+ # SetHandler ruby-object
+ # RubyHandler Apache::ERubyRun.instance
+ # Options ExecCGI
+ # </Location>
+ #
+ # # handle *.rhtml as eruby files.
+ # <Files *.rhtml>
+ # SetHandler ruby-object
+ # RubyHandler Apache::ERubyRun.instance
+ # </Files>
+
+ # # for Apache::ERbRun
+ # RubyRequire apache/erb-run
+ #
+ # # handle files under /erb as eRuby files by ERb.
+ # <Location /erb>
+ # SetHandler ruby-object
+ # RubyHandler Apache::ERbRun.instance
+ # Options ExecCGI
+ # </Location>
+
+ # # for debug
+ # RubyRequire auto-reload
+</IfModule>
+
Added: packages/cooker/apache-mod_ruby/current/SOURCES/mod_ruby-1.2.6.tar.gz
==============================================================================
Binary file. No diff available.
Modified: packages/cooker/apache-mod_ruby/current/SPECS/apache-mod_ruby.spec
==============================================================================
--- packages/cooker/apache-mod_ruby/current/SPECS/apache-mod_ruby.spec
(original)
+++ packages/cooker/apache-mod_ruby/current/SPECS/apache-mod_ruby.spec Mon Feb
12 12:50:03 2007
@@ -5,13 +5,13 @@
Summary: Mod_ruby is a DSO module for the apache web server
Name: apache-%{mod_name}
-Version: 1.2.5
-Release: %mkrel 2
+Version: 1.2.6
+Release: %mkrel 1
Group: System/Servers
License: BSD
URL: http://www.modruby.net/
-Source0: %{mod_name}-%{version}.tar.bz2
-Source1: %{mod_conf}.bz2
+Source0: %{mod_name}-%{version}.tar.gz
+Source1: %{mod_conf}
BuildRequires: ruby-devel
Requires: ruby
Requires(pre): rpm-helper
@@ -36,6 +36,8 @@
%setup -q -n %{mod_name}-%{version}
+cp %{SOURCE1} %{mod_conf}
+
# strip away annoying ^M
find . -type f|xargs file|grep 'CRLF'|cut -d: -f1|xargs perl -p -i -e 's/\r//'
find . -type f|xargs file|grep 'text'|cut -d: -f1|xargs perl -p -i -e 's/\r//'
@@ -57,7 +59,7 @@
make DESTDIR="%{buildroot}" install
mv %{buildroot}%{_libdir}/apache/%{mod_so}
%{buildroot}%{_libdir}/apache-extramodules
-bzcat %{SOURCE1} > %{buildroot}%{_sysconfdir}/httpd/modules.d/%{mod_conf}
+install -m0644 %{mod_conf}
%{buildroot}%{_sysconfdir}/httpd/modules.d/%{mod_conf}
install -d %{buildroot}%{_var}/www/html/addon-modules
ln -s ../../../..%{_docdir}/%{name}-%{version}
%{buildroot}%{_var}/www/html/addon-modules/%{name}-%{version}
