- rel 0.1

[packages/apache-mod_jk.git] / apache-mod_jk.spec

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index cf33c32eb97c86a2f62f440b68b2752973d23b4e..65e52b7e17c542d4f956aa38e1c6a0e01559e5d7 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -1,36 +1,34 @@
 # TODO:
-# - fix looking for /usr/lib/apache/lib/apache/build/config_vars.mk....
 # - logrotate file
-# /TODO
 %define                mod_name        jk
 %define                apxs            /usr/sbin/apxs
 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.8
-Release:       0.9
-License:       Apache
+Version:       1.2.15
+Release:       0.1
+License:       Apache License 2.0
 Group:         Networking/Daemons
-Source0:       http://www.apache.org/dist/jakarta/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5: eb579c47f8dd71e526d7561c919ce06d
+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
-URL:           http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
+Patch0:                %{name}-libtool.patch
+URL:           http://tomcat.apache.org/connectors-doc/
 BuildRequires: %{apxs}
-BuildRequires: apache-devel >= 2.0.40
-BuildRequires: apr-devel
-BuildRequires: apr-util-devel
+BuildRequires: apache-devel >= 2.2.0-6.1
+BuildRequires: apr-devel >= 1:1.0
+BuildRequires: apr-util-devel >= 1:1.0
 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}
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 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
@@ -43,38 +41,30 @@ Tomcat-Apache obs
 
 %prep
 %setup -q -n jakarta-tomcat-connectors-%{version}-src
+%patch0 -p1
 
 %build
 cd jk/native
-
-if [ -z "$JAVA_HOME" ]; then
-       JAVA_HOME=%{_libdir}/java
-fi
-export JAVA_HOME
-./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
 install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/var/{lock/mod_jk,log/httpd}}
 
-cd jk/native
-
-%{__make} install \
+%{__make} -C jk/native install \
        DESTDIR=$RPM_BUILD_ROOT \
        APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \
        libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
 
-echo "LoadModule jk_module     %{_pkglibdir}/mod_jk.so" > $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
-cat %{SOURCE1} >> $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
-
+install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
 touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
 
 %clean
@@ -84,7 +74,11 @@ rm -rf $RPM_BUILD_ROOT
 if [ -f /var/lock/subsys/httpd ]; then
        /etc/rc.d/init.d/httpd restart 1>&2
 fi
-touch /var/log/httpd/mod_jk.log
+if [ ! -f /var/log/httpd/mod_jk.log ]; then
+       umask 027
+       touch /var/log/httpd/mod_jk.log
+       chown root:logs /var/log/httpd/mod_jk.log
+fi
 
 %preun
 if [ "$1" = "0" ]; then
@@ -95,8 +89,8 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc jk/native/{README,CHANGES.txt}
-%config(noreplace) %{_sysconfdir}/httpd.conf/80_mod_jk.conf
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(750,http,http) /var/lock/mod_jk
-%attr(640,root,logs) %ghost %config(noreplace) /var/log/httpd/mod_jk.log
+%doc jk/native/{README,CHANGES}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_mod_%{mod_name}.conf
+%attr(755,root,root) %{_pkglibdir}/*.so
+%attr(770,root,http) /var/lock/mod_jk
+%attr(640,root,logs) %ghost /var/log/httpd/mod_jk.log