SPECS: jakarta-tomcat.spec - it is apache tomcat now (cvs admin pl...

[glen]

Author: glen                         Date: Tue Apr 17 20:24:09 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- it is apache tomcat now (cvs admin please cp spec)

---- Files affected:
SPECS:
   jakarta-tomcat.spec (1.44 -> 1.45) 

---- Diffs:

================================================================
Index: SPECS/jakarta-tomcat.spec
diff -u SPECS/jakarta-tomcat.spec:1.44 SPECS/jakarta-tomcat.spec:1.45
--- SPECS/jakarta-tomcat.spec:1.44	Mon Apr 16 18:10:23 2007
+++ SPECS/jakarta-tomcat.spec	Tue Apr 17 22:23:57 2007
@@ -6,20 +6,20 @@
 #
 Summary:	Apache Servlet/JSP Engine, RI for Servlet 2.4/JSP 2.0 API
 Summary(pl.UTF-8):	Silnik Servlet/JSP Apache będący wzorcową implementacją API Servlet 2.4/JSP 2.0
-Name:		jakarta-tomcat
+Name:		apache-tomcat
 Version:	5.5.23
 Release:	0.1
 License:	Apache
 Group:		Development/Languages/Java
 #Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v5.0.30/src/%{name}-%{version}-src.tar.gz
-Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-tomcat-%{version}-src.tar.gz
+Source0:	http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/%{name}-%{version}-src.tar.gz
 # Source0-md5:	362d1d8b15dc09882440dcab8c592dd7
 #Source0:	http://apache.zone-h.org/
 Source1:	%{name}.init
-Patch0:		apache-tomcat-skip-servletapi.patch
-Patch1:		apache-tomcat-nsis.patch
-Patch2:		apache-tomcat-native.patch
-Patch3:		apache-tomcat-skip-jdt.patch
+Patch0:		%{name}-skip-servletapi.patch
+Patch1:		%{name}-nsis.patch
+Patch2:		%{name}-native.patch
+Patch3:		%{name}-skip-jdt.patch
 URL:		http://tomcat.apache.org/
 # required:
 BuildRequires:	ant >= 1.5.3
@@ -93,6 +93,7 @@
 Requires:	xml-commons
 Provides:	group(http)
 Provides:	user(http)
+Obsoletes:	jakarta-tomcat
 BuildArch:	noarch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -114,13 +115,14 @@
 %description -l pl.UTF-8
 Tomcat to kontener serwletowy używany przez oficjalną implementację
 wzorcową technologii Java Servlet i JavaServer Pages. Specyfikacje
-Java Servlet i JavaServer Pages są rozwijane przez Suna zgodnie z
-Java Community Process.
+Java Servlet i JavaServer Pages są rozwijane przez Suna zgodnie z Java
+Community Process.
 
 %package doc
-Summary:	The Tomcat Servlet/JSP Container documentation
+Summary:	The Apache Tomcat Servlet/JSP Container documentation
 Summary(pl.UTF-8):	Dokumentacja do Tomcata - kontekera Servlet/JSP
 Group:		Development/Languages/Java
+Obsoletes:	jakarta-tomcat-doc
 
 %description doc
 The Tomcat Servlet/JSP Container documentation.
@@ -129,7 +131,7 @@
 Dokumentacja do Tomcata - kontekera Servlet/JSP.
 
 %prep
-%setup -q -n apache-tomcat-%{version}-src
+%setup -q -n %{name}-%{version}-src
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
@@ -510,6 +512,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.45  2007/04/17 20:23:57  glen
+- it is apache tomcat now (cvs admin please cp spec)
+
 Revision 1.44  2007/04/16 16:10:23  qboosh
 - updated pl
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/jakarta-tomcat.spec?r1=1.44&r2=1.45&f=u