Author: pawelz                       Date: Mon May 25 05:21:09 2009 GMT
Module: packages                      Tag: DEVEL
---- Log message:
- first attempt to package tomcat 6.
- NFY

---- Files affected:
packages/tomcat:
   tomcat.spec (1.124 -> 1.124.2.1) 

---- Diffs:

================================================================
Index: packages/tomcat/tomcat.spec
diff -u packages/tomcat/tomcat.spec:1.124 packages/tomcat/tomcat.spec:1.124.2.1
--- packages/tomcat/tomcat.spec:1.124   Mon May 18 10:18:56 2009
+++ packages/tomcat/tomcat.spec Mon May 25 07:21:03 2009
@@ -6,15 +6,15 @@
 %bcond_with    jta             # put jta jar into tomcat lib dir.
 %bcond_without java_sun        # build with gcj (does not work)
 #
-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
+Summary:       Apache Servlet/JSP Engine, RI for Servlet 2.5/JSP 2.1 API
+Summary(pl.UTF-8):     Silnik Servlet/JSP Apache będący wzorcową implementacją 
API Servlet 2.5/JSP 2.1
 Name:          tomcat
-Version:       5.5.27
-Release:       1
+Version:       6.0.18
+Release:       0.1
 License:       Apache v2.0
 Group:         Networking/Daemons/Java
-Source0:       
http://www.apache.org/dist/tomcat/tomcat-5/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
-# Source0-md5: eb3f196013550b9b1684e4ff18593a8e
+Source0:       
http://www.apache.org/dist/tomcat/tomcat-6/v%{version}/src/apache-%{name}-%{version}-src.tar.gz
+# Source0-md5: 9bdbb1c1d79302c80057a70b18fe6721
 Source1:       apache-%{name}.init
 Source2:       apache-%{name}.sysconfig
 Source10:      apache-%{name}-context-ROOT.xml
@@ -22,15 +22,15 @@
 Source12:      apache-%{name}-context-jsp-examples.xml
 Source13:      apache-%{name}-context-tomcat-docs.xml
 Source14:      apache-%{name}-context-webdav.xml
-Patch0:                apache-%{name}-skip-servletapi.patch
-Patch1:                apache-%{name}-nsis.patch
-Patch2:                apache-%{name}-native.patch
-Patch3:                apache-%{name}-skip-jdt.patch
-Patch4:                apache-%{name}-no-connectors.patch
-Patch5:                apache-%{name}-dbcp.patch
-Patch6:                apache-%{name}-struts.patch
-Patch7:                apache-%{name}-admin-struts.patch
-Patch8:                apache-%{name}-no_links_to_examples.patch
+# Patch0:              apache-%{name}-skip-servletapi.patch
+# Patch1:              apache-%{name}-nsis.patch
+# Patch2:              apache-%{name}-native.patch
+# Patch3:              apache-%{name}-skip-jdt.patch
+# Patch4:              apache-%{name}-no-connectors.patch
+# Patch5:              apache-%{name}-dbcp.patch
+# Patch6:              apache-%{name}-struts.patch
+# Patch7:              apache-%{name}-admin-struts.patch
+# Patch8:              apache-%{name}-no_links_to_examples.patch
 URL:           http://tomcat.apache.org/
 %if %{with java_sun}
 BuildRequires: java-sun >= 1.5
@@ -181,26 +181,21 @@
 
 %prep
 %setup -q -n apache-%{name}-%{version}-src
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
+#%%patch0 -p1
+#%%patch1 -p1
+#%%patch2 -p1
+#%%patch3 -p1
+#%%patch4 -p1
+#%%patch5 -p1
+#%%patch6 -p1
+#%%patch7 -p1
+#%%patch8 -p1
 
 # we don't need those scripts
 rm -f container/catalina/src/bin/*.bat
 rm -f container/catalina/src/bin/{startup,shutdown}.sh
 
-# causes file(1) rpm to abort, and not really neccessary file
-# file: Thumbs.db: ERROR: Cannot read short stream (Invalid argument)
-# rpm: error: magic_file(ms, "Thumbs.db") failed: mode 37777700644 Cannot read 
short stream (Invalid argument)
-rm container/webapps/admin/images/Thumbs.db
-
-# servletapi built from java-servletapi5.spec
+# servletapi built from java-servletapi.spec
 rm -rf servletapi
 
 # Remove pre-built jars
@@ -448,6 +443,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.124.2.1  2009/05/25 05:21:03  pawelz
+- first attempt to package tomcat 6.
+- NFY
+
 Revision 1.124  2009/05/18 08:18:56  pawelz
 - BR: s/jakarta-regexp/java-regexp/
 
================================================================

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

_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to