SPECS: apache-mod_ruby.spec - unified; use system ruby macros

[glen]

Author: glen                         Date: Mon Dec 26 22:45:09 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified; use system ruby macros

---- Files affected:
SPECS:
   apache-mod_ruby.spec (1.12 -> 1.13) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_ruby.spec
diff -u SPECS/apache-mod_ruby.spec:1.12 SPECS/apache-mod_ruby.spec:1.13
--- SPECS/apache-mod_ruby.spec:1.12	Mon Dec 12 14:44:44 2005
+++ SPECS/apache-mod_ruby.spec	Mon Dec 26 23:45:03 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - fix build with apache/apr (apr_off_t)
 %define		mod_name	mod_ruby
 %define 	apxs		/usr/sbin/apxs
 Summary:	Apache mod_ruby module - embeds the Ruby interpreter into the Apache web server
@@ -15,15 +17,14 @@
 URL:		http://www.modruby.net/
 BuildRequires:	%{apxs}
 BuildRequires:	apache-devel >= 2.0
+BuildRequires:	rpmbuild(macros) >= 1.272
 BuildRequires:	ruby-devel >= 1:1.6.4
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 1.3.3
+Requires:	apache(modules-api) = %apache_modules_api
 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"]')
+%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,
@@ -48,13 +49,9 @@
 %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.conf
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/70_mod_ruby.conf
-
 cp -a lib/* $RPM_BUILD_ROOT%{ruby_rubylibdir}
 
 %clean
@@ -76,7 +73,7 @@
 %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/*.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
 %attr(755,root,root) %{_pkglibdir}/*
 %{ruby_rubylibdir}/*
 
@@ -86,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.13  2005/12/26 22:45:03  glen
+- unified; use system ruby macros
+
 Revision 1.12  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_ruby.spec?r1=1.12&r2=1.13&f=u