- migrate to apache 2.4

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

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index 3485a4e979cdde0b91b8f8de97cce032ad5944ce..5e658d332d32a791ee19296c3feef2f972110324 100644 (file)
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -5,17 +5,18 @@
 Summary:       Apache module that handles communication between Tomcat and Apache
 Summary(pl.UTF-8):     Moduł Apache'a obsługujący komunikację między Tomcatem a Apachem
 Name:          apache-mod_%{mod_name}
-Version:       1.2.27
-Release:       1
+Version:       1.2.37
+Release:       2
 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: a15cc9e3813ef5b081c7de10e6a1fbed
+Source0:       http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5: 64c3803477b47c5b7ef7f0e4a416e45e
 Source1:       %{name}.conf
+Source2:       %{name}-workers.properties
 Patch0:                %{name}-apxs.patch
+Patch1:                %{name}-libtool.patch
 URL:           http://tomcat.apache.org/connectors-doc/
-BuildRequires: %{apxs}
-BuildRequires: apache-devel >= 2.2
+BuildRequires: apache-devel >= 2.4
 BuildRequires: autoconf
 BuildRequires: automake
 BuildRequires: jpackage-utils
@@ -28,7 +29,7 @@ Obsoletes:    jakarta-tomcat-connectors-jk
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %define                _pkglibdir      %(%{apxs} -q LIBEXECDIR 2>/dev/null)
-%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)/conf.d
+%define                _sysconfdir     %(%{apxs} -q SYSCONFDIR 2>/dev/null)
 
 %description
 JK is a replacement to the elderly mod_jserv. It was a completely new
@@ -42,6 +43,7 @@ Tomcat-Apache obsługującą komunikację między Tomcatem a Apachem.
 %prep
 %setup -q -n tomcat-connectors-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
 cd native
@@ -51,18 +53,17 @@ cd native
 %{__automake}
 %{__autoconf}
 %configure \
-       --with-apxs=%{apxs} \
-       --with-java-home="%{java_home}"
+       --with-apxs=%{apxs}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir},/var/{lock/mod_jk,log/httpd}}
-
+install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/conf.d,/var/{lock/mod_jk,log/httpd}}
 %{__make} -C native install \
        DESTDIR=$RPM_BUILD_ROOT
 
-install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/80_mod_jk.conf
+cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/conf.d/80_mod_jk.conf
+cp -p %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/workers.properties
 touch $RPM_BUILD_ROOT/var/log/httpd/mod_jk.log
 
 %clean
@@ -83,8 +84,9 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc native/{README.txt,CHANGES,NEWS}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*_mod_%{mod_name}.conf
+%doc native/{README.txt,STATUS.txt,TODO.txt} conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/conf.d/*_mod_%{mod_name}.conf
+%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/workers.properties
 %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