- -libtool.patch for ccache build

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

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index af25392e2e2c16f2524e0f222dc2d48d3e3825bb..cd037f7d2b7dd98bbd339a50cc356a1e5a47ec35 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -1,91 +1,92 @@
+# TODO:
+# - logrotate file
 %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
+Summary(pl.UTF-8):     Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem
 Name:          apache-mod_%{mod_name}
-Version:       1.2.4
+Version:       1.2.28
 Release:       1
-License:       Apache
-Group:         Networking/Daemons
-Source0:       http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/release/v%{version}/src/jakarta-tomcat-connectors-jk-%{version}-src.tar.gz
-# Source0-md5: 9641a826b87e64692377161215cfd5e1
+License:       Apache v2.0
+Group:         Networking/Daemons/HTTP
+Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5: db3990a95d0a9a874e798f305c91931c
 Source1:       %{name}.conf
-URL:           http://jakarta.apache.org/builds/jakarta-tomcat-connectors/jk/doc/
+Patch0:                %{name}-apxs.patch
+Patch1:                %{name}-libtool.patch
+URL:           http://tomcat.apache.org/connectors-doc/
 BuildRequires: %{apxs}
-BuildRequires: libtool
-BuildRequires: automake
+BuildRequires: apache-devel >= 2.2
 BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: jpackage-utils
+BuildRequires: libtool
 BuildRequires: perl-base
-BuildRequires: rpmbuild(macros) >= 1.120
-PreReq:                apache >= 2.0.40
+BuildRequires: rpmbuild(macros) >= 1.300
 Requires:      apache(modules-api) = %{apache_modules_api}
-BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+Obsoletes:     apache-mod_jk2
 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)/conf.d
 
 %description
 JK is a replacement to the elderly mod_jserv. It was a completely new
 Tomcat-Apache plug-in that handles the communication between Tomcat
 and Apache.
 
-%description -l pl
-JK jest zamiennikiem starego mod_jserv. Jest ca³kowicie now± wtyczk±
-Tomcat-Apache obs³uguj±c± komunikacjê miêdzy Tomcatem a Apachem.
+%description -l pl.UTF-8
+JK jest zamiennikiem starego mod_jserv. Jest całkowicie nową wtyczką
+Tomcat-Apache obsługującą komunikację między Tomcatem a Apachem.
 
 %prep
-%setup -q -n jakarta-tomcat-connectors-jk-%{version}-src
+%setup -q -n tomcat-connectors-%{version}-src
+%patch0 -p1
+%patch1 -p1
 
 %build
-cd jk/native
-
-if [ -z "$JAVA_HOME" ]; then
-       JAVA_HOME=/usr/lib/java
-fi
-export JAVA_HOME
-./buildconf.sh
-
+cd native
+%{__libtoolize}
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
 %configure \
-       --enable-EAPI \
        --with-apxs=%{apxs} \
-       --with-java-home=${JAVA_HOME}
-
-%{__make} \
-       EXTRA_CFLAGS="`apr-config --includes` `apu-config --includes`"
+       --with-java-home="%{java_home}"
+%{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/var/lock/mod_jk}
-
-cd jk/native
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/{lock/mod_jk,log/httpd}}
 
-%{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT \
-       APXS="%{apxs} -S LIBEXECDIR=$RPM_BUILD_ROOT%{_pkglibdir}" \
-       libexecdir=$RPM_BUILD_ROOT%{_pkglibdir}
+%{__make} -C native install \
+       DESTDIR=$RPM_BUILD_ROOT
 
-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}/80_mod_jk.conf
+touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
-if [ -f /var/lock/subsys/httpd ]; then
-       /etc/rc.d/init.d/httpd restart 1>&2
+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
+%service -q httpd restart
 
-%preun
+%postun
 if [ "$1" = "0" ]; then
-       if [ -f /var/lock/subsys/httpd ]; then
-               /etc/rc.d/init.d/httpd restart 1>&2
-       fi
+       %service -q httpd restart
 fi
 
 %files
 %defattr(644,root,root,755)
-%doc jk/native/{README,CHANGES.txt} jk/docs/*
-%config(noreplace) %{_sysconfdir}/httpd.conf/80_mod_jk.conf
-%attr(755,root,root) %{_pkglibdir}/*
-%attr(750,http,http) /var/lock/mod_jk
+%doc native/{README.txt,CHANGES,NEWS}
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_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