- use %service

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

diff --git a/apache-mod_ruby.spec b/apache-mod_ruby.spec
index 4822165cbae0f4b35874725c15f4cbff42bd5771..8efa2810cfbf4686dadaf9884377e1e2f102f2b8 100644 (file)
--- a/apache-mod_ruby.spec
+++ b/apache-mod_ruby.spec
@@ -1,29 +1,31 @@
+# TODO
+# - fix build with apache/apr (apr_off_t)
 %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
+Group:         Networking/Daemons
 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/
-BuildRequires: apache-devel >= 1.3.3
 BuildRequires: %{apxs}
-BuildRequires: ruby >= 1:1.6.4
-Requires(post,preun):  %{apxs}
-Requires:      apache >= 1.3.3
+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
@@ -31,7 +33,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
@@ -47,34 +49,26 @@ gdyby by
 %install
 rm -rf $RPM_BUILD_ROOT
 
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{ruby_rubylibdir}}
+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/httpd.conf
-install %{SOURCE1} $RPM_BUILD_ROOT%{_modrubyconf}
-
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_ruby.conf
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
-fi
+%service -q httpd restart
 
 %preun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %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/httpd.conf/70_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}/*