[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

rpms/eclipse/devel eclipse-ecj-classpath.patch, NONE, 1.1 eclipse.spec, 1.177, 1.178



Author: gbenson

Update of /cvs/dist/rpms/eclipse/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8192

Modified Files:
	eclipse.spec 
Added Files:
	eclipse-ecj-classpath.patch 
Log Message:
Allow leading separators in classpaths (e.o#105430)

eclipse-ecj-classpath.patch:
 Main.java |    2 ++
 1 files changed, 2 insertions(+)

--- NEW FILE eclipse-ecj-classpath.patch ---
--- eclipse-3.1.0_fc/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java.orig	2005-07-28 10:15:53.000000000 +0100
+++ eclipse-3.1.0_fc/plugins/org.eclipse.jdt.core/batch/org/eclipse/jdt/internal/compiler/batch/Main.java	2005-07-27 17:21:16.000000000 +0100
@@ -2049,6 +2049,8 @@
 					token = tokenizer.nextToken();
 					if (token.equals(File.pathSeparator)) {
 						switch (state) {
+						case start:
+							break;
 						case readyToClose:
 						case readyToCloseEndingWithRules:
 						case readyToCloseOrOtherEntry:


Index: eclipse.spec
===================================================================
RCS file: /cvs/dist/rpms/eclipse/devel/eclipse.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- eclipse.spec	25 Jul 2005 15:55:50 -0000	1.177
+++ eclipse.spec	28 Jul 2005 10:58:11 -0000	1.178
@@ -24,7 +24,7 @@
 Summary:        %{pkg_summary}
 Name:           eclipse
 Version:        %{eclipse_majmin}.%{eclipse_micro}_fc
-Release:        10
+Release:        11
 License:        EPL
 Group:          Text Editors/Integrated Development Environments (IDE)
 URL:            http://www.eclipse.org/
@@ -96,6 +96,8 @@
 # https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=162177
 Patch34:	%{name}-bz162177.patch
 Patch35:	%{name}-javadoc.patch
+# https://bugs.eclipse.org/bugs/show_bug.cgi?id=105430
+Patch36:	%{name}-ecj-classpath.patch
 
 %if %{gcj_support}
 ExclusiveArch: %{ix86} x86_64 ppc
@@ -351,6 +353,7 @@
 popd
 %patch34 -p1
 %patch35 -p0
+%patch36 -p1
 
 %if %{gcj_support}
   # Fedora splash screen.
@@ -392,7 +395,6 @@
 #ln -sf %{_javadir}/ant.jar plugins/org.apache.ant/lib/ant.jar
 ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant/lib/ant-javamail.jar
 ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant/lib/ant-jdepend.jar
-#ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant/lib/ant-jmf.jar
 ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant/lib/ant-jsch.jar
 ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant/lib/ant-junit.jar
 ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant/lib/ant-launcher.jar
@@ -752,7 +754,6 @@
 #ln -sf %{_javadir}/ant.jar plugins/org.apache.ant_*/lib/ant.jar
 ln -sf %{_javadir}/ant/ant-javamail.jar plugins/org.apache.ant_*/lib
 ln -sf %{_javadir}/ant/ant-jdepend.jar plugins/org.apache.ant_*/lib/ant-jdepend.jar
-#ln -sf %{_javadir}/ant/ant-jmf.jar plugins/org.apache.ant_*/lib/ant-jmf.jar
 ln -sf %{_javadir}/ant/ant-jsch.jar plugins/org.apache.ant_*/lib/ant-jsch.jar
 ln -sf %{_javadir}/ant/ant-junit.jar plugins/org.apache.ant_*/lib/ant-junit.jar
 ln -sf %{_javadir}/ant-launcher.jar plugins/org.apache.ant_*/lib/ant-launcher.jar
@@ -765,6 +766,7 @@
 # we can build them using free stuff, we will. -- overholt, 2005-07-04
 rm -f plugins/org.apache.ant_*/lib/ant-icontract.jar
 rm -f plugins/org.apache.ant_*/lib/ant-jai.jar
+rm -f plugins/org.apache.ant_*/lib/ant-jmf.jar
 rm -f plugins/org.apache.ant_*/lib/ant-netrexx.jar
 rm -f plugins/org.apache.ant_*/lib/ant-starteam.jar
 rm -f plugins/org.apache.ant_*/lib/ant-stylebook.jar
@@ -837,8 +839,7 @@
 aot-compile-rpm \
 --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.workbench_%{eclipse_majmin}.%{eclipse_micro}.jar \
 --exclude %{_datadir}/%{name}/plugins/org.eclipse.ui.forms_%{eclipse_majmin}.%{eclipse_micro}.jar \
---exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar \
---exclude %{_datadir}/%{name}/plugins/org.apache.ant_1.6.5/lib/ant-jmf.jar
+--exclude %{_datadir}/%{name}/plugins/org.eclipse.osgi_%{eclipse_majmin}.%{eclipse_micro}.jar
 
 # Build and install ecj binary
 pushd $RPM_BUILD_ROOT%{_libdir}/gcj/%{name}
@@ -1160,6 +1161,10 @@
 %{_datadir}/%{name}/plugins/org.eclipse.platform.source.linux.gtk.*_3.1.0
 
 %changelog
+* Thu Jul 28 2005 Gary Benson <gbenson redhat com> 3.1.0_fc-11
+- Allow leading separators in classpaths (e.o#105430).
+- Clear away ant-jmf entirely.
+
 * Mon Jul 25 2005 Andrew Overholt <overholt redhat com> 3.1.0_fc-10
 - Change mozilla BuildRequirement to be equals and not greater-than or equals
   since we need the exact version for our patches.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]