SPECS: apache-mod_caml.spec - unified

[glen]

Author: glen                         Date: Mon Dec 26 19:16:10 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- unified

---- Files affected:
SPECS:
   apache-mod_caml.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_caml.spec
diff -u SPECS/apache-mod_caml.spec:1.5 SPECS/apache-mod_caml.spec:1.6
--- SPECS/apache-mod_caml.spec:1.5	Mon Dec 12 14:44:44 2005
+++ SPECS/apache-mod_caml.spec	Mon Dec 26 20:16:05 2005
@@ -1,4 +1,6 @@
 # $Revision$, $Date$
+# TODO
+# - fix build for apache 2.2
 %define		mod_name	mod_caml
 %define 	apxs		/usr/sbin/apxs
 Summary:	Apache mod_caml module - allows using bytecode compiled ocaml files with apache
@@ -13,19 +15,18 @@
 Patch0:		%{mod_name}-Makefile.diff
 URL:		http://merjis.com/developers/mod_caml/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel >= 1.3.3
+BuildRequires:	apache-devel >= 2.0
 BuildRequires:	apr-devel
 BuildRequires:	ocaml
 BuildRequires:	ocaml-findlib
 BuildRequires:	ocaml-pcre-devel
 BuildRequires:	ocaml-postgres
-Requires(post,preun):	%{apxs}
-Requires:	apache >= 1.3.3
+Requires:	apache(modules-api) = %apache_modules_api
 Requires:	ocaml >= 3.0.8
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 # I don't understand it but it is neccessary if one strips
 # it, it won't work. Help welcome.
@@ -42,8 +43,8 @@
    presentation).
  - Works with Apache 1.3 and Apache 2.0.
  - DBI library for simple database access.
- - DBI library can use Perl DBDs (database drivers)
-   [requires Perl4Caml >= 0.3.6].
+ - DBI library can use Perl DBDs (database drivers) [requires Perl4Caml
+   >= 0.3.6].
 
 %description -l pl
 mod_caml to zbiór dowiązań Objective CAML-a (OCamla) dla API Apache'a.
@@ -90,7 +91,7 @@
 %files
 %defattr(644,root,root,755)
 %doc COPYING.LIB CHANGES README examples html icons modcaml-example.conf
-%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}/*.so
 %{_libdir}/ocaml
 %{_datadir}/%{mod_name}
@@ -101,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/12/26 19:16:05  glen
+- unified
+
 Revision 1.5  2005/12/12 13:44:44  glen
 - adapterized (sorted %verify attrs)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_caml.spec?r1=1.5&r2=1.6&f=u