- typo

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

diff --git a/apache-mod_ruby.spec b/apache-mod_ruby.spec
index f8bcae698fa58ae19691db36ccb016038357fedb..6110ec0c602e32a237227d86deb31f7b9182a153 100644 (file)
--- a/apache-mod_ruby.spec
+++ b/apache-mod_ruby.spec
@@ -1,26 +1,27 @@
 %define                mod_name        mod_ruby
 %define        apxs            /usr/sbin/apxs
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR)
-%define                _httpdconf      %{_sysconfdir}/httpd/httpd.conf
-%define                _modrubyconf    %{_sysconfdir}/httpd/mod_ruby.conf
+%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.0.7
-Release:       0.9
+Version:       1.2.2
+Release:       1
 Group:         Networking/Daemons
 License:       BSD-like
 Source0:       http://www.modruby.net/archive/%{mod_name}-%{version}.tar.gz
-# Source0-md5: b03bb4e2fe58f6f3251a8aa168364221
+# Source0-md5: 786d740c84ec6aba73d0450b546b4642
 Source1:       %{name}.conf
 Patch0:                %{name}-struct.patch
 URL:           http://www.modruby.net/
 BuildRequires: apache-devel >= 1.3.3
 BuildRequires: %{apxs}
-BuildRequires: ruby >= 1.6.4
+BuildRequires: ruby >= 1:1.6.4
 Requires(post,preun):  %{apxs}
 Requires:      apache >= 1.3.3
-Requires:      ruby >= 1.6.4
+Requires:      ruby >= 1:1.6.4
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -30,7 +31,7 @@ start up much faster than without mod_ruby.
 
 %description -l pl
 mod_ruby zapewnia obs³ugê skryptów Ruby'ego bezpo¶rednio z poziomu
-Apache'a, dziêki czemu bêd± siê one ³adowa³y znacnie szybciej ni¿
+Apache'a, dziêki czemu bêd± siê one ³adowa³y znacznie szybciej ni¿
 gdyby by³y wywo³ywane tradycyjnie.
 
 %prep
@@ -39,45 +40,41 @@ gdyby by
 
 %build
 ./configure.rb \
+       --with-apr-includes='/usr/include/apr -I/usr/include/apr-util'\
        --with-apxs=%{apxs}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT%{_pkglibdir}
+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
+install -d $RPM_BUILD_ROOT%{_sysconfdir}/httpd/httpd.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_modrubyconf}
 
+cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-%{apxs} -e -a -n ruby %{_pkglibdir}/%{mod_name}.so 1>&2
-if [ -f %{_httpdconf} ] && ! grep -q "^Include.*%{modrubyconf}" %{_httpdconf}; then
-       echo "Include %{_modrubyconf}" >> %{_httpdconf}
-fi
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
 
 %preun
 if [ "$1" = "0" ]; then
-       %{apxs} -e -A -n ruby %{_pkglibdir}/%{mod_name}.so 1>&2
        if [ -f /var/lock/subsys/httpd ]; then
                /etc/rc.d/init.d/httpd restart 1>&2
        fi
-       umask 027
-       cat %{_httpdconf} | grep -v "Include %{_modrubyconf}" > %{_httpdconf}.tmp
-       mv -f %{_httpdconf}.tmp %{_httpdconf}
 fi
 
 %files
 %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/mod_ruby.conf
+%attr(640,root,root) %config(noreplace) %verify(not size mtime md5) %{_sysconfdir}/httpd/httpd.conf/70_mod_ruby.conf
 %attr(755,root,root) %{_pkglibdir}/*
+%{ruby_rubylibdir}/*