packages (DEVEL): tomcat/tomcat.spec - kosher source0 url - merged my impro...

[baggins]

Author: baggins                      Date: Mon Dec  6 10:09:28 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- kosher source0 url
- merged my improvements from HEAD

---- Files affected:
packages/tomcat:
   tomcat.spec (1.172.2.23 -> 1.172.2.24) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.23 packages/tomcat/tomcat.spec:1.172.2.24
--- packages/tomcat/tomcat.spec:1.172.2.23	Wed Dec  1 21:21:46 2010
+++ packages/tomcat/tomcat.spec	Mon Dec  6 11:09:23 2010
@@ -1,6 +1,4 @@
 # $Revision$, $Date$
-# TODO:
-# - merge baggins' improvements from HEAD
 
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
@@ -18,10 +16,10 @@
 Summary(pl.UTF-8):	Serwer www i silnik Servlet/JSP będący wzorcową implementacją API Servlet %{servletapiver}/JSP %{jspapiver}
 Name:		tomcat
 Version:	7.0.5
-Release:	1.%{subver}.%{rel}
+Release:	0.%{subver}.%{rel}
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
-Source0: http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v%{version}%{subver}/src/apache-%{name}-%{version}-src.tar.gz
+Source0:	http://www.apache.org/dist/tomcat/tomcat-7/v%{version}-%{subver}/src/apache-%{name}-%{version}-src.tar.gz
 # Source0-md5:	8fec5203e6b7920f6b18a41149910629
 Source1:	apache-%{name}.init
 Source2:	apache-%{name}.sysconfig
@@ -35,6 +33,9 @@
 # Source100-md5:	e5cfa8cca13152d7545fde6b1783c60a
 Patch0:		%{name}-build.xml.patch
 Patch1:		server.xml-URIEncoding-utf8.patch
+Patch2:		%{name}-LDAPUserDatabase.patch
+Patch3:		%{name}-catalina.policy-javadir.patch
+Patch4:		%{name}-userdir.patch
 Patch100:	jcl-build.xml.patch
 URL:		http://tomcat.apache.org/
 BuildRequires:	ant >= 1.5.3
@@ -253,6 +254,9 @@
 %setup -q -a100 -n apache-%{name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
+%patch3 -p1
+%patch4 -p1
 
 # Prepare java-commmons-logging sources
 mkdir -p output/extras/logging
@@ -279,8 +283,8 @@
 # Extras
 mkdir -p output/extras/webservices
 
-ln -s %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
-ln -s %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
+ln -sf %{_javadir}/geronimo-spec-jaxrpc.jar output/extras/webservices/jaxrpc.jar
+ln -sf %{_javadir}/jsr109.jar output/extras/webservices/wsdl4j.jar
 
 cat > output/extras/logging/commons-logging-%{jclver}-src/build.properties << EOF
 log4j12.jar=%(find-jar log4j)
@@ -530,6 +534,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.24  2010/12/06 10:09:23  baggins
+- kosher source0 url
+- merged my improvements from HEAD
+
 Revision 1.172.2.23  2010/12/01 20:21:46  pawelz
 - DF does not understand things like %{?subver:-%subver}
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/tomcat/tomcat.spec?r1=1.172.2.23&r2=1.172.2.24&f=u