SPECS: apache-mod_jk2.spec - rel 2 (rebuild with new apache)

[glen]

Author: glen                         Date: Wed Dec 21 23:41:27 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 2 (rebuild with new apache)

---- Files affected:
SPECS:
   apache-mod_jk2.spec (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_jk2.spec
diff -u SPECS/apache-mod_jk2.spec:1.6 SPECS/apache-mod_jk2.spec:1.7
--- SPECS/apache-mod_jk2.spec:1.6	Sat Dec 25 18:55:31 2004
+++ SPECS/apache-mod_jk2.spec	Thu Dec 22 00:41:22 2005
@@ -5,7 +5,7 @@
 Summary(pl):	Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem
 Name:		apache-mod_%{mod_name}
 Version:	2.0.4
-Release:	1
+Release:	2
 License:	Apache
 Group:		Networking/Daemons
 Source0:	http://www.apache.org/dist/jakarta/tomcat-connectors/jk2/jakarta-tomcat-connectors-jk2-src-current.tar.gz
@@ -13,19 +13,19 @@
 Source1:	%{name}.conf
 URL:		http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel > 2.0.40
-BuildRequires:	automake
+BuildRequires:	apache-devel >= 2.0.40
 BuildRequires:	autoconf
+BuildRequires:	automake
 BuildRequires:	libtool
 BuildRequires:	perl-base
 BuildRequires:	rpmbuild(macros) >= 1.120
-PreReq:		apache >= 2.0.40
 Requires:	apache(modules-api) = %{apache_modules_api}
+Requires:	apache >= 2.0.40
 Obsoletes:	jakarta-tomcat-connectors-jk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR)
-%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR)
+%define		_pkglibdir	%(%{apxs} -q LIBEXECDIR 2>/dev/null)
+%define		_sysconfdir	%(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 JK is a replacement to the elderly mod_jserv. It was a completely new
@@ -83,6 +83,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.7  2005/12/21 23:41:22  glen
+- rel 2 (rebuild with new apache)
+
 Revision 1.6  2004/12/25 17:55:31  qboosh
 - cleanups
 
================================================================

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