From: areq <areq@pld-linux.org>
Date: Tue, 30 Jan 2007 14:01:07 +0000 (+0000)
Subject: - 1.2.20
X-Git-Tag: auto/ac/apache-mod_jk-1_2_25-1~9
X-Git-Url: https://git.pld-linux.org/gitweb.cgi?p=packages%2Fapache-mod_jk.git;a=commitdiff_plain;h=b997a0253c833e521763cb55998a99ab645acf82

- 1.2.20

Changed files:
    apache-mod_jk-apxs.patch -> 1.2
    apache-mod_jk.spec -> 1.39
---

diff --git a/apache-mod_jk-apxs.patch b/apache-mod_jk-apxs.patch
index 8af83a6..82905f5 100644
--- a/apache-mod_jk-apxs.patch
+++ b/apache-mod_jk-apxs.patch
@@ -1,11 +1,11 @@
---- jakarta-tomcat-connectors-1.2.15-src/jk/native/apache-2.0/Makefile.in~	2005-12-28 16:19:42.000000000 +0200
-+++ jakarta-tomcat-connectors-1.2.15-src/jk/native/apache-2.0/Makefile.in	2006-01-02 15:12:19.000000000 +0200
+--- jakarta-tomcat-connectors-1.2.15-src/native/apache-2.0/Makefile.in~	2005-12-28 16:19:42.000000000 +0200
++++ jakarta-tomcat-connectors-1.2.15-src/native/apache-2.0/Makefile.in	2006-01-02 15:12:19.000000000 +0200
 @@ -71,7 +71,7 @@
  install_dynamic:
  	@echo ""
  	@echo "Installing files to Apache Modules Directory..."
 -	$(APXS) -i mod_jk.la
-+	$(APXS) -S DESTDIR=$(DESTDIR) -i mod_jk.la
++	$(APXS) -i -S DESTDIR=$(DESTDIR) mod_jk.la
  	@echo ""
  	@echo "Please be sure to arrange ${APACHE_DIR}/conf/httpd.conf..."
  	@echo ""
diff --git a/apache-mod_jk.spec b/apache-mod_jk.spec
index 110c58f..a3acc9d 100644
--- a/apache-mod_jk.spec
+++ b/apache-mod_jk.spec
@@ -5,12 +5,12 @@
 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.15
-Release:	0.2
+Version:	1.2.20
+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
+Source0: 	http://www.apache.org/dist/tomcat/tomcat-connectors/jk/source/jk-%{version}/tomcat-connectors-%{version}-src.tar.gz
+# Source0-md5:	f10709339009b3be9398d3a838d9cabd
 Source1:	%{name}.conf
 Patch0:		%{name}-libtool.patch
 Patch1:		%{name}-apxs.patch
@@ -39,12 +39,12 @@ JK jest zamiennikiem starego mod_jserv. Jest ca
 Tomcat-Apache obs³uguj±c± komunikacjê miêdzy Tomcatem a Apachem.
 
 %prep
-%setup -q -n jakarta-tomcat-connectors-%{version}-src
-%patch0 -p1
+%setup -q -n tomcat-connectors-%{version}-src
+#%patch0 -p1
 %patch1 -p1
 
 %build
-cd jk/native
+cd native
 %{__libtoolize}
 %{__aclocal}
 %{__autoheader}
@@ -59,7 +59,7 @@ cd jk/native
 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 \
+%{__make} -C native install \
 	DESTDIR=$RPM_BUILD_ROOT
 
 install %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/httpd.conf/80_mod_jk.conf
@@ -83,7 +83,7 @@ fi
 
 %files
 %defattr(644,root,root,755)
-%doc jk/native/{README,CHANGES,NEWS}
+%doc native/{README,CHANGES,NEWS}
 %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