upgrading package: tomcat-adapter 3.2.4 -> 5.5.9

tomcat-adapter/tomcat-adapter.conf

@@ -13,7 +13,7 @@ JkLogFile     @l_prefix@/var/tomcat-adapter/tomcat-adapter.log
 JkLogLevel    warn
 
 #   assigning URLs to Tomcat
-JkMount       /*.jsp      ajp12
-JkMount       /servlet/*  ajp12
-JkMount       /examples/* ajp12
+JkMount       /*.jsp      ajp13
+JkMount       /servlet/*  ajp13
+JkMount       /examples/* ajp13
 

tomcat-adapter/tomcat-adapter.spec

@@ -32,33 +32,37 @@ Distribution: OpenPKG
 Class:        EVAL
 Group:        Web
 License:      Apache Software License 1.1
-Version:      3.2.4
-Release:      20040920
+Version:      5.5.9
+Release:      20050408
+
+#   package options
+%option       with_eapi  no
 
 #   list of sources
-Source0:      http://jakarta.apache.org/builds/jakarta-tomcat/release/v%{version}/src/jakarta-tomcat-%{version}-src.tar.gz
+Source0:      http://www.apache.org/dist/jakarta/tomcat-5/v%{version}/src/jakarta-tomcat-%{version}-src.tar.gz
 Source1:      tomcat-adapter.conf
 
 #   build information
 Prefix:       %{l_prefix}
 BuildRoot:    %{l_buildroot}
-BuildPreReq:  OpenPKG, openpkg >= 20040130, JDK, apache, gcc, perl
-PreReq:       OpenPKG, openpkg >= 20040130, JDK
+BuildPreReq:  OpenPKG, openpkg >= 20040130, perl, gcc, make, autoconf, libtool, automake
+PreReq:       OpenPKG, openpkg >= 20040130
+BuildPreReq:  apache, apr
+PreReq:       apache, apr
 AutoReq:      no
 AutoReqProv:  no
 
 %description
-    Apache Jakarta Tomcat Webserver Adapter %{version} is a glue code
-    between the Apache webserver and Tomcat.
+    Apache Jakarta Tomcat webserver adapter is a glue code between the
+    Apache HTTO server and Apache Tomcat. This package contains the
+    mod_jk connector for Apache 1.3 only.
 
 %track
     prog tomcat-adapter = {
-        disabled
         version   = %{version}
-        comment   = "rse: upgrade needed (ANY HELP APPRECIATED!)"
-        url       = http://jakarta.apache.org/builds/jakarta-tomcat/release/
-        regex     = v((\d+\.)*\d+)/
-        url       = http://jakarta.apache.org/builds/jakarta-tomcat/release/v__NEWVER__/src/
+        url       = http://www.apache.org/dist/jakarta/tomcat-5/
+        regex     = (v\d+\.\d+\.\d+)
+        url       = http://www.apache.org/dist/jakarta/tomcat-5/__NEWVER__/src/
         regex     = jakarta-tomcat-(__VER__)-src\.tar\.gz
     }
 
@@ -66,25 +70,19 @@ AutoReqProv:  no
     %setup -q -n jakarta-tomcat-%{version}-src
 
 %build
-    #   determine platform dependent things
-    opts=""; subdir=""
-    case "%{l_platform -t}" in
-        *-freebsd*) opts="-DFREEBSD";          subdir=freebsd ;;
-        *-linux*)   opts="-DLINUX";            subdir=linux   ;;
-        *-sunos*)   opts="-DSOLARIS -lposix4"; subdir=solaris ;;
-    esac
-
-    #   create installation tree
-    j=`%{l_rc} --query JDK_home`
-    cd src/native/apache1.3
-    %{l_prefix}/sbin/apxs \
-        $opts \
-        -S CC=%{l_prefix}/bin/gcc \
-        -S LD_SHLIB=%{l_prefix}/bin/gcc \
-        -I../jk -I$j/include \
-        -I../jk -I$j/include/$subdir \
-        -o mod_jk.so \
-        -c mod_jk.c ../jk/*.c
+    ( cd jakarta-tomcat-connectors/jk/native
+      sh buildconf.sh
+      ./configure \
+          --prefix=%{l_prefix} \
+          --with-apr=%{l_prefix} \
+          --with-apxs=%{l_prefix}/sbin/apxs \
+%if "%{with_eapi}" == "yes"
+          --enable-EAPI
+%else
+          --disable-EAPI
+%endif
+      %{l_make} %{l_mflags} LIBTOOL=$PWD/libtool
+    ) || exit $?
 
 %install
     rm -rf $RPM_BUILD_ROOT
@@ -100,12 +98,15 @@ AutoReqProv:  no
         %{SOURCE tomcat-adapter.conf} \
         $RPM_BUILD_ROOT%{l_prefix}/etc/tomcat-adapter/
 
-    #   install DSO
+    #   install mod_jk DSO
     %{l_shtool} install -c -m 755 \
-        src/native/apache1.3/mod_jk.so \
-        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat-adapter/
+        jakarta-tomcat-connectors/jk/native/apache-1.3/mod_jk.so.0 \
+        $RPM_BUILD_ROOT%{l_prefix}/libexec/tomcat-adapter/mod_jk.so
 
-    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT %{l_files_std}
+    #   determine installation files
+    %{l_rpmtool} files -v -ofiles -r$RPM_BUILD_ROOT \
+        %{l_files_std} \
+        '%config %{l_prefix}/etc/tomcat-adapter/*'
 
 %files -f files