[eclipse] The patch has been contributed upstream.
Krzysztof Daniel
kdaniel at fedoraproject.org
Fri Aug 24 08:59:40 UTC 2012
commit 3efd1a22f4fe02c66ebc83ef2e768009f45bf056
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Thu Aug 23 14:22:36 2012 +0200
The patch has been contributed upstream.
The patch has been modified to copy the missing class file only when it
is missing to make it possible to release it into upstream.
eclipse-fix-compatibility-class.patch | 11 ++++++++++-
eclipse.spec | 3 +++
2 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/eclipse-fix-compatibility-class.patch b/eclipse-fix-compatibility-class.patch
index d2b3359..ddd38b8 100644
--- a/eclipse-fix-compatibility-class.patch
+++ b/eclipse-fix-compatibility-class.patch
@@ -1,10 +1,17 @@
--- eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml.bak 2012-07-25 17:28:30.000000000 +0200
+++ eclipse.platform.runtime/bundles/org.eclipse.core.runtime.compatibility.registry/pom.xml 2012-07-30 15:48:17.936540760 +0200
-@@ -23,4 +23,49 @@
+@@ -23,4 +23,58 @@
<artifactId>org.eclipse.core.runtime.compatibility.registry</artifactId>
<version>3.5.100-SNAPSHOT</version>
<packaging>eclipse-plugin</packaging>
+
++ <profiles>
++ <profile>
++ <activation>
++ <file>
++ <missing>classes/org/eclipse/core/runtime/IPluginDescriptor.class</missing>
++ </file>
++ </activation>
+ <build>
+ <plugins>
+ <plugin>
@@ -49,4 +56,6 @@
+ </plugin>
+ </plugins>
+ </build>
++ </profile>
++ </profiles>
</project>
diff --git a/eclipse.spec b/eclipse.spec
index 51ac33f..2f9ef17 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -65,6 +65,8 @@ Patch10: %{name}-fix-master-equinox.patch
#services
Patch11: %{name}-osgi-unpack-sources.patch
Patch12: %{name}-fix-debug-ui.patch
+
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=384873
Patch13: %{name}-fix-compatibility-class.patch
Patch14: %{name}-fix-pde-ui-compilation.patch
@@ -1213,6 +1215,7 @@ rm -rf %{_bindir}/efj/
- Symlink junit 4.
- Move additional, non-Eclipse sources back to eclipse-build.
- Make the patch for setting BREE smaller.
+- Patch for the compatibility.registry updated.
* Wed Aug 22 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.0-10
- Fix Eclipse not picking anything from dropins folder.
More information about the scm-commits
mailing list