SPECS: apache-mod_jk.spec - rel 0.1

[glen]

Author: glen                         Date: Wed Dec 28 14:12:08 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- rel 0.1

---- Files affected:
SPECS:
   apache-mod_jk.spec (1.31 -> 1.32) 

---- Diffs:

================================================================
Index: SPECS/apache-mod_jk.spec
diff -u SPECS/apache-mod_jk.spec:1.31 SPECS/apache-mod_jk.spec:1.32
--- SPECS/apache-mod_jk.spec:1.31	Tue Dec 27 00:59:19 2005
+++ SPECS/apache-mod_jk.spec	Wed Dec 28 15:12:02 2005
@@ -6,17 +6,17 @@
 Summary:	Apache module that handles communication between Tomcat and Apache
 Summary(pl):	Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem
 Name:		apache-mod_%{mod_name}
-Version:	1.2.14.1
+Version:	1.2.15
 Release:	0.1
-License:	Apache
+License:	Apache License 2.0
 Group:		Networking/Daemons
-Source0:	http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-1.2.14/jakarta-tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5:	41a90c633088e0f1ba422c10546a028a
+Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5:	b815a666329f7de097775113547539e0
 Source1:	%{name}.conf
 Patch0:		%{name}-libtool.patch
-URL:		http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
+URL:		http://tomcat.apache.org/connectors-doc/
 BuildRequires:	%{apxs}
-BuildRequires:	apache-devel >= 2.0.40
+BuildRequires:	apache-devel >= 2.2.0-6.1
 BuildRequires:	apr-devel >= 1:1.0
 BuildRequires:	apr-util-devel >= 1:1.0
 BuildRequires:	autoconf
@@ -46,24 +46,15 @@
 
 %build
 cd jk/native
-
-if [ -z "$JAVA_HOME" ]; then
-	JAVA_HOME=%{_libdir}/java
-fi
-export JAVA_HOME
-
-# temp hack for broken apxs (fixed in apache-apxs-2.2.0-6.1)
-sed -i -e 's#`.*exp_installbuilddir`#%{_prefix}/lib/apache/build/#' configure.in
-
-./buildconf.sh
-
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 %configure \
-	--enable-EAPI \
 	--with-apxs=%{apxs} \
-	--with-java-home=${JAVA_HOME}
-
-%{__make} \
-	EXTRA_CFLAGS="`apr-1-config --includes` `apu-1-config --includes`"
+	--with-java-home="${JAVA_HOME:-%{_libdir}/java}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -111,6 +102,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.32  2005/12/28 14:12:02  glen
+- rel 0.1
+
 Revision 1.31  2005/12/26 23:59:19  glen
 - unified, build fixes
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/apache-mod_jk.spec?r1=1.31&r2=1.32&f=u