packages (DEVEL): tomcat/tomcat.spec - up to 7.0.0-beta - correct apis vers...

[pawelz]

Author: pawelz                       Date: Tue Jun 29 11:57:55 2010 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- up to 7.0.0-beta
- correct apis version info
- switch to official download URL

---- Files affected:
packages/tomcat:
   tomcat.spec (1.172.2.13 -> 1.172.2.14) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.172.2.13 packages/tomcat/tomcat.spec:1.172.2.14
--- packages/tomcat/tomcat.spec:1.172.2.13	Thu Jun 10 14:00:43 2010
+++ packages/tomcat/tomcat.spec	Tue Jun 29 13:57:49 2010
@@ -3,10 +3,10 @@
 # Conditional build:
 %bcond_without	javadoc		# skip building javadocs
 
-%define		jspapiver	2.1
-%define		servletapiver	2.5
+%define		jspapiver	2.2
+%define		servletapiver	3.0
 
-%define		subver	rc4
+%define		subver	beta
 %define		rel	0.2
 # Java Commons Logging version. Must be >= 1.1.
 %define		jclver	1.1.1
@@ -16,11 +16,11 @@
 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.0
-Release:	0.%{subver}.%{rel}
+Release:	1.%{subver}.%{rel}
 License:	Apache v2.0
 Group:		Networking/Daemons/Java
-Source0:	http://execve.pl/PLD/%{name}-%{version}.tar.bz2
-# Source0-md5:	cc386ea8fbc8efde51a3238cfb294191
+Source0: http://ftp.tpnet.pl/vol/d1/apache/tomcat/tomcat-7/v%{version}%{?subver:-%subver}/src/apache-%{name}-%{version}-src.tar.gz
+# Source0-md5:	339f5e5dd73ac257bea50d567e231f9a
 Source1:	apache-%{name}.init
 Source2:	apache-%{name}.sysconfig
 Source3:	%{name}-build.properties
@@ -247,7 +247,7 @@
 javax.servlet.http, javax.servlet.jsp i java.servlet.jsp.tagext).
 
 %prep
-%setup -q -a100
+%setup -q -a100 -n apache-%{name}-%{version}-src
 
 %patch0 -p1
 
@@ -520,6 +520,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.172.2.14  2010/06/29 11:57:49  pawelz
+- up to 7.0.0-beta
+- correct apis version info
+- switch to official download URL
+
 Revision 1.172.2.13  2010/06/10 12:00:43  sparky
 - BR: java-avalon-logkit, java-junit, java-log4j
 
================================================================

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