- BR s@%{apxs}@apache-apxs@g

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

diff --git a/apache-mod_ruby.spec b/apache-mod_ruby.spec
index f8bcae698fa58ae19691db36ccb016038357fedb..970e32fbf34bed66bcc64aa0a41fe937e7843184 100644 (file)
--- a/apache-mod_ruby.spec
+++ b/apache-mod_ruby.spec
@@ -1,37 +1,38 @@
 %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
 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
+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.0.7
-Release:       0.9
-Group:         Networking/Daemons
+Version:       1.2.5
+Release:       1
 License:       BSD-like
+Group:         Networking/Daemons
 Source0:       http://www.modruby.net/archive/%{mod_name}-%{version}.tar.gz
-# Source0-md5: b03bb4e2fe58f6f3251a8aa168364221
+# Source0-md5: 3c867008bd6518c1fec395d9040cd964
 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
-Requires(post,preun):  %{apxs}
-Requires:      apache >= 1.3.3
-Requires:      ruby >= 1.6.4
+BuildRequires: apache-apxs >= 2.0
+BuildRequires: apache-devel >= 2.0
+BuildRequires: rpmbuild(macros) >= 1.268
+BuildRequires: ruby-devel >= 1:1.6.4
+Requires:      apache(modules-api) = %apache_modules_api
+Requires:      ruby >= 1:1.6.4
+%{?ruby_mod_ver_requires_eq}
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
+%define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
+
 %description
 mod_ruby embeds the Ruby interpreter into the Apache web server,
 allowing Ruby CGI scripts to be executed natively. These scripts will
 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¿
-gdyby by³y wywo³ywane tradycyjnie.
+%description -l pl.UTF-8
+mod_ruby zapewnia obsługę skryptów Ruby'ego bezpośrednio z poziomu
+Apache'a, dzięki czemu będą się one ładowały znacznie szybciej niż
+gdyby były wywoływane tradycyjnie.
 
 %prep
 %setup -q -n %{mod_name}-%{version}
@@ -39,45 +40,33 @@ 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},%{_sysconfdir}/httpd.conf,%{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 %{SOURCE1} $RPM_BUILD_ROOT%{_modrubyconf}
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_%{mod_name}.conf
+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
+%service -q httpd restart
 
-%preun
+%postun
 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}
+       %service -q httpd restart
 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(755,root,root) %{_pkglibdir}/*
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
+%{ruby_rubylibdir}/*