- fix config dir

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

diff --git a/apache-mod_ruby.spec b/apache-mod_ruby.spec
index e7b99f254e7f8ff684b2565c0ce2fd3ff81bde42..da27779591ca3c903ab2f2ea0cf08a44242e9e74 100644 (file)
--- a/apache-mod_ruby.spec
+++ b/apache-mod_ruby.spec
@@ -1,14 +1,16 @@
+# TODO:
+#      - make it work with ruby 1.9, currently any request -> Sig11
 %define                mod_name        mod_ruby
 %define        apxs            /usr/sbin/apxs
 Summary:       Apache mod_ruby module - embeds the Ruby interpreter into the Apache web server
 Summary(pl.UTF-8):     Moduł Apache'a mod_ruby - zapewniający obsługę skryptów rubego przez serwer Apache
 Name:          apache-%{mod_name}
-Version:       1.2.5
-Release:       1
+Version:       1.3.0
+Release:       1.1
 License:       BSD-like
-Group:         Networking/Daemons
+Group:         Networking/Daemons/HTTP
 Source0:       http://www.modruby.net/archive/%{mod_name}-%{version}.tar.gz
-# Source0-md5: 3c867008bd6518c1fec395d9040cd964
+# Source0-md5: 5aae358c3c9f1bfa2554da9242289ab7
 Source1:       %{name}.conf
 Patch0:                %{name}-struct.patch
 URL:           http://www.modruby.net/
@@ -22,7 +24,7 @@ Requires:     ruby >= 1:1.6.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
 
 %description
 mod_ruby embeds the Ruby interpreter into the Apache web server,
@@ -46,10 +48,9 @@ gdyby były wywoływane tradycyjnie.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,%{ruby_rubylibdir}}
-install %{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/%{mod_name}.so
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},%{ruby_rubylibdir}}
+install -p %{mod_name}.so $RPM_BUILD_ROOT%{_pkglibdir}/%{mod_name}.so
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/70_mod_%{mod_name}.conf
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 
 %clean
@@ -67,6 +68,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 md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*.so
 %{ruby_rubylibdir}/*