X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=apache-mod_jk.spec;h=5e658d332d32a791ee19296c3feef2f972110324;hb=HEAD;hp=0c31558ee1c4f905ed9bac5c810ba40ae2c0128d;hpb=8828bafa54b88efcb3304fb32621afcf448e6d1f;p=packages%2Fapache-mod_jk.git

diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index 0c31558..5e658d3 100644
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -3,27 +3,28 @@
 %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.15
-Release:	0.1
-License:	Apache License 2.0
-Group:		Networking/Daemons
-Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-%{version}/jakarta-tomcat-connectors-%{version}-src.tar.gz
-# Source0-md5:	b815a666329f7de097775113547539e0
+Version:	1.2.37
+Release:	2
+License:	Apache v2.0
+Group:		Networking/Daemons/HTTP
+Source0:	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5:	64c3803477b47c5b7ef7f0e4a416e45e
 Source1:	%{name}.conf
-Patch0:		%{name}-libtool.patch
+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.0-6.8
-BuildRequires:	apr-devel >= 1:1.0
-BuildRequires:	apr-util-devel >= 1:1.0
+BuildRequires:	apache-devel >= 2.4
 BuildRequires:	autoconf
 BuildRequires:	automake
+BuildRequires:	jpackage-utils
 BuildRequires:	libtool
 BuildRequires:	perl-base
-BuildRequires:	rpmbuild(macros) >= 1.120
+BuildRequires:	rpmbuild(macros) >= 1.300
 Requires:	apache(modules-api) = %{apache_modules_api}
+Obsoletes:	apache-mod_jk2
 Obsoletes:	jakarta-tomcat-connectors-jk
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -35,34 +36,34 @@ 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-%{version}-src
+%setup -q -n tomcat-connectors-%{version}-src
 %patch0 -p1
+%patch1 -p1
 
 %build
-cd jk/native
+cd native
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
 %{__automake}
 %{__autoconf}
 %configure \
-	--with-apxs=%{apxs} \
-	--with-java-home="${JAVA_HOME:-%{_libdir}/java}"
+	--with-apxs=%{apxs}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_pkglibdir},%{_sysconfdir}/httpd.conf,/var/{lock/mod_jk,log/httpd}}
-
-%{__make} -C jk/native install \
+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}/httpd.conf/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
@@ -74,21 +75,18 @@ if [ ! -f /var/log/httpd/mod_jk.log ]; then
 	touch /var/log/httpd/mod_jk.log
 	chown root:logs /var/log/httpd/mod_jk.log
 fi
-if [ -f /var/lock/subsys/httpd ]; then
-	/etc/rc.d/init.d/httpd restart 1>&2
-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}
-%attr(640,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/httpd.conf/*_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