- updated to 1.2.4

[packages/apache-mod_ruby.git] / apache-mod_ruby.spec

diff --git a/apache-mod_ruby.spec b/apache-mod_ruby.spec
index 6110ec0c602e32a237227d86deb31f7b9182a153..6495763b8ae6ce588977b24667e278d7e27c1027 100644 (file)
--- a/apache-mod_ruby.spec
+++ b/apache-mod_ruby.spec
@@ -1,18 +1,14 @@
 %define                mod_name        mod_ruby
 %define        apxs            /usr/sbin/apxs
-%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _modrubyconf    %{_sysconfdir}/httpd/httpd.conf/70_mod_ruby.conf
-%define        ruby_archdir    %(ruby -r rbconfig -e 'print Config::CONFIG["archdir"]')
-%define ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
 Summary:       Apache mod_ruby module - embeds the Ruby interpreter into the Apache web server
 Summary(pl):   Modu³ Apache'a mod_ruby - zapewniaj±cy obs³ugê skryptów rubego przez serwer Apache
 Name:          apache-%{mod_name}
-Version:       1.2.2
+Version:       1.2.4
 Release:       1
 Group:         Networking/Daemons
 License:       BSD-like
 Source0:       http://www.modruby.net/archive/%{mod_name}-%{version}.tar.gz
-# Source0-md5: 786d740c84ec6aba73d0450b546b4642
+# Source0-md5: 2b803c021297517eecb3dc6cf77b9534
 Source1:       %{name}.conf
 Patch0:                %{name}-struct.patch
 URL:           http://www.modruby.net/
@@ -24,6 +20,10 @@ Requires:    apache >= 1.3.3
 Requires:      ruby >= 1:1.6.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR)
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
+%define                ruby_rubylibdir %(ruby -r rbconfig -e 'print Config::CONFIG["rubylibdir"]')
+
 %description
 mod_ruby embeds the Ruby interpreter into the Apache web server,
 allowing Ruby CGI scripts to be executed natively. These scripts will
@@ -51,8 +51,8 @@ install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{ruby_rubylibdir}}
 install %{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/%{mod_name}.so
 
 # Install the config file
-install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_modrubyconf}
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_ruby.conf
 
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 
@@ -75,6 +75,6 @@ fi
 %defattr(644,root,root,755)
 %doc COPYING ChangeLog README.en examples doc/*
 %lang(ja) %doc README.ja
-%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/70_mod_ruby.conf
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd.conf/*.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %{ruby_rubylibdir}/*