From 4e89d4259999266b0d4403a7aff1044ddf5c96e6 Mon Sep 17 00:00:00 2001
From: Ben Konrath <bkonrath@fedoraproject.org>
Date: Dec 19 2006 21:57:24 +0000
Subject: - Use sed instead of patch for tomcat version.


---

diff --git a/eclipse-tomcat55-build.patch b/eclipse-tomcat55-build.patch
index 0e607ec..d049aa5 100644
--- a/eclipse-tomcat55-build.patch
+++ b/eclipse-tomcat55-build.patch
@@ -1,14 +1,5 @@
 --- build.xml.orig	2006-07-05 12:47:26.000000000 -0400
 +++ build.xml	2006-07-05 12:50:49.000000000 -0400
-@@ -58,7 +58,7 @@
- 		<antcall target="gather.bin.parts">
- 			<param name="destination.temp.folder" value="${temp.folder}/"/>
- 		</antcall>
--		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" filesonly="false" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar" basedir="${temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" filesonly="false" whenempty="skip" update="false"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
 @@ -144,50 +144,56 @@
  			<pathelement path="${build.result.folder}/../org.apache.ant/lib/ant-xalan1.jar"/>
  			<pathelement path="../org.apache.ant/lib/ant-xslp.jar"/>
@@ -110,61 +101,3 @@
  		</path>
  		<!-- compile the source code -->
  		<javac destdir="${temp.folder}/tomcatwrapper.jar.bin" failonerror="${javacFailOnError}" verbose="${javacVerbose}" debug="${javacDebugInfo}" includeAntRuntime="no" bootclasspath="${bundleBootClasspath}" source="${bundleJavacSource}" target="${bundleJavacTarget}"		>
-@@ -224,37 +230,37 @@
- 	</target>
- 
- 	<target name="gather.bin.parts" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
- 			<fileset dir="${build.result.folder}" includes="tomcatwrapper.jar"			/>
- 		</copy>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="true" overwrite="false">
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="true" overwrite="false">
- 			<fileset dir="${basedir}" includes="conf/,webapps/,plugin.xml,*.jar,plugin.properties,preferences.ini,about.html,META-INF/,about_files/"			/>
- 		</copy>
--		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" version="4.1.130.v20060601"/>
-+		<eclipse.versionReplacer path="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" version="5.5.17.v20060601"/>
- 	</target>
- 
- 	<target name="build.zips" depends="init">
- 	</target>
- 
- 	<target name="gather.sources" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
--		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
--		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false">
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
-+		<copy file="${build.result.folder}/tomcatwrappersrc.zip" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
-+		<copy todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false">
- 			<fileset dir="${basedir}" includes="about.html,*.license"			/>
- 		</copy>
- 	</target>
- 
- 	<target name="gather.logs" depends="init" if="destination.temp.folder">
--		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601"/>
--		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_4.1.130.v20060601" failonerror="false" overwrite="false"/>
-+		<mkdir dir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601"/>
-+		<copy file="${temp.folder}/tomcatwrapper.jar.bin${logExtension}" todir="${destination.temp.folder}/org.eclipse.tomcat_5.5.17.v20060601" failonerror="false" overwrite="false"/>
- 	</target>
- 
- 	<target name="clean" depends="init" description="Clean the plug-in: org.eclipse.tomcat of all the zips, jars and logs created.">
- 		<delete file="${build.result.folder}/tomcatwrapper.jar"/>
- 		<delete file="${build.result.folder}/tomcatwrappersrc.zip"/>
--		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.jar"/>
--		<delete file="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.jar"/>
-+		<delete file="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
-@@ -277,7 +283,7 @@
- 		<delete>
- 			<fileset dir="${temp.folder}" includes="**/*.bin${logExtension}"			/>
- 		</delete>
--		<zip destfile="${plugin.destination}/org.eclipse.tomcat_4.1.130.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
-+		<zip destfile="${plugin.destination}/org.eclipse.tomcat_5.5.17.v20060601.zip" basedir="${temp.folder}" filesonly="true" whenempty="skip" update="false"/>
- 		<delete dir="${temp.folder}"/>
- 	</target>
- 
diff --git a/eclipse.spec b/eclipse.spec
index 2b5d171..930b3bd 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -19,7 +19,7 @@ Epoch:	1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}
-Release:        25%{?dist} 
+Release:        26%{?dist} 
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -1700,6 +1700,9 @@ fi
 %{_libdir}/%{name}/plugins/org.eclipse.sdk_*
 
 %changelog
+* Tue Dec 19 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-26
+- Use sed instead of patch for tomcat version.
+
 * Wed Dec 6 2006 Ben Konrath <bkonrath@redhat.com> 3.2.1-25
 - Add %%{_libdir}/eclipse dir to files list of libswt-gtk2.
 - Resolves: #211008.