rpms/tomcat5/devel tomcat5-5.5-connectors-util-build.patch, NONE, 1.1 tomcat5.spec, 1.95, 1.96

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Wed Mar 14 21:36:44 UTC 2007


Author: vivekl

Update of /cvs/dist/rpms/tomcat5/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28241

Modified Files:
	tomcat5.spec 
Added Files:
	tomcat5-5.5-connectors-util-build.patch 
Log Message:
- Add patch to force -source to 5.0 when 1.5 support enabled since
  ecj seems to use 1.4 as default still
- Remove mx4j from the endorsed directory since gcj-compat has 
  the necessary bits



tomcat5-5.5-connectors-util-build.patch:
 build.xml |    3 +++
 1 files changed, 3 insertions(+)

--- NEW FILE tomcat5-5.5-connectors-util-build.patch ---
--- ./connectors/util/build.xml.sav	2007-03-14 15:13:18.000000000 -0400
+++ ./connectors/util/build.xml	2007-03-14 17:25:27.000000000 -0400
@@ -44,7 +44,9 @@
         <available property="commons-logging.present" file="${commons-logging.jar}"/>
         <available property="modeler.present" file="${commons-modeler.jar}"/>
 	<available property="jdk1.4.present" classname="java.lang.CharSequence" />
+        <condition property="build.javac.source" value="5.0" else="1.4">
         <available property="jdk1.5.present" classname="javax.net.ssl.CertPathTrustManagerParameters" />
+        </condition>
     </target>
 
     <target name="build-prepare" depends="detect">
@@ -72,6 +74,7 @@
 	       debug="${compile.debug}"
 	       optimize="off"
 	       verbose="off"
+               source="${build.javac.source}"
 	       excludes="**/CVS/**">
             <classpath>
                <path refid="compile.classpath"/>


Index: tomcat5.spec
===================================================================
RCS file: /cvs/dist/rpms/tomcat5/devel/tomcat5.spec,v
retrieving revision 1.95
retrieving revision 1.96
diff -u -r1.95 -r1.96
--- tomcat5.spec	19 Feb 2007 18:52:28 -0000	1.95
+++ tomcat5.spec	14 Mar 2007 21:36:42 -0000	1.96
@@ -97,6 +97,10 @@
 Patch16: %{name}-%{majversion}-jspc-classpath.patch
 #FIXME Disable JSP pre-compilation on ppc64 and x390x
 Patch18: %{name}-%{majversion}-skip-jsp-precompile.patch
+# XXX:
+# Seems to be only needed when building with ECJ for java 1.5 since
+# the default source type for ecj is still 1.4
+Patch19: %{name}-%{majversion}-connectors-util-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{epoch}-%{version}-%{release}-root-%(%{__id_u} -n)
 %if ! %{gcj_support}
 BuildArch: noarch
@@ -459,6 +463,7 @@
 %ifarch ppc64 s390x
 %patch18 -b .p18
 %endif
+%patch19 -b .p19
 
 %if %{without_ecj}
     %{__rm} %{jname}/src/share/org/apache/jasper/compiler/JDTCompiler.java
@@ -554,7 +559,8 @@
 ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" init
 cp ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/servletapi/jsr154/dist/lib/servlet-api.jar \
         ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/build/build/common/lib/servlet-api.jar
-    ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
+#    ant -Dbuild.compiler="modern" -Djava.home="%{java_home}" build
+    ant -Djava.home="%{java_home}" build
 popd
 # build the connectors
 pushd ${RPM_BUILD_DIR}/%{name}-%{version}/%{packdname}/connectors
@@ -928,10 +934,8 @@
 for repository in %{commondir}/endorsed ; do
     find $repository -name '\[*\]*.jar' -not -type d | xargs %{__rm} -f
 done
-# XXX: Needs to be removed as soon as the new java-gcj-compat rpm makes it through
-# (it will containt the mx4j stuff to make up for buggy JMX support in GCJ)
 build-jar-repository %{commondir}/endorsed jaxp_parser_impl \
-    xml-commons-apis mx4j/mx4j-jmx mx4j/mx4j-impl 2>&1
+    xml-commons-apis 2>&1
 %if %{gcj_support}
 %{_bindir}/rebuild-gcj-db
 %endif
@@ -1330,7 +1334,8 @@
 - Replace references to geronimo JTA with a generic one available in Fedora
 - Use Fedora compliant build root specification
 - Enabling juli still kills tomcat5 on startup, disabled
-- Add link to mx4j jars for now till the new java-gcj-compat rpm is added
+- Add patch to force -source to 5.0 when 1.5 support enabled since
+  ecj seems to use 1.4 as default still
 
 * Sun Jan 14 2007 Jason Corley <jason.corley at gmail.com> 0:5.5.20-4jpp
 - remove jk2 configs as mod_jk2 has been deprecated upstream




More information about the fedora-cvs-commits mailing list