SPECS: jakarta-tomcat.spec - save changes

[glen]

Author: glen                         Date: Thu Apr 19 18:57:59 2007 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- save changes

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

---- Diffs:

================================================================
Index: SPECS/jakarta-tomcat.spec
diff -u SPECS/jakarta-tomcat.spec:1.45 SPECS/jakarta-tomcat.spec:1.46
--- SPECS/jakarta-tomcat.spec:1.45	Tue Apr 17 22:23:57 2007
+++ SPECS/jakarta-tomcat.spec	Thu Apr 19 20:57:54 2007
@@ -15,11 +15,12 @@
 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
+Source1:	jakarta-tomcat.init
 Patch0:		%{name}-skip-servletapi.patch
 Patch1:		%{name}-nsis.patch
 Patch2:		%{name}-native.patch
 Patch3:		%{name}-skip-jdt.patch
+Patch4:		%{name}-no-connectors.patch
 URL:		http://tomcat.apache.org/
 # required:
 BuildRequires:	ant >= 1.5.3
@@ -48,7 +49,7 @@
 BuildRequires:	rpmbuild(macros) >= 1.300
 BuildRequires:	xerces-j
 %if %{with javadoc}
-BuildRequires:	commons-el
+BuildRequires:	jakarta-commons-el
 %endif
 # optional:
 BuildRequires:	jaf >= 1.0.1
@@ -136,9 +137,12 @@
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
-# servletapi built from jakarta-servletapi5
+# servletapi built from jakarta-servletapi5.spec
 rm -rf servletapi
+# connectors (apache2 for now only) are built from apache-mod_jk.spec
+rm -rf connectors
 
 # Remove pre-built jars
 find -name '*.jar' | xargs rm -fv
@@ -271,7 +275,8 @@
 
 EOF
 
-%ant
+%ant \
+	-Dcompile.source=1.4
 
 exit 1
 
@@ -512,6 +517,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.46  2007/04/19 18:57:54  glen
+- save changes
+
 Revision 1.45  2007/04/17 20:23:57  glen
 - it is apache tomcat now (cvs admin please cp spec)
 
================================================================

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