[eclipse/f18] - Moved launcher version change after secondary fragments creation. - Created some directories when
Krzysztof Daniel
kdaniel at fedoraproject.org
Wed Oct 24 11:34:42 UTC 2012
commit b6e1e8e24ce9571ac59fde16d51b2c59e95b2bc1
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date: Wed Oct 24 13:27:47 2012 +0200
- Moved launcher version change after secondary fragments creation.
- Created some directories when creating secondary fragments.
Conflicts:
eclipse.spec
eclipse-no-source-for-dependencies.patch | 4 +-
eclipse-secondary-arches.patch | 138 ++++++++++++++++++++++++++++++
eclipse.spec | 20 +++--
3 files changed, 154 insertions(+), 8 deletions(-)
---
diff --git a/eclipse-no-source-for-dependencies.patch b/eclipse-no-source-for-dependencies.patch
index 65e9d18..970166e 100644
--- a/eclipse-no-source-for-dependencies.patch
+++ b/eclipse-no-source-for-dependencies.patch
@@ -451,7 +451,7 @@
+ <plugin id="org.apache.geronimo.specs.geronimo-annotation_1.1_spec" /><plugin id="org.apache.batik.util.gui"/>
+ <plugin id=" org.apache.felix.gogo.command" /><plugin id="javax.inject"/>
+ <plugin id="org.apache.felix.gogo.runtime" /><plugin id="org.w3c.css.sac"/>
-+ <plugin id="org.apache.felix.gogo.shell" />
++ <plugin id="org.apache.felix.gogo.shell" /><plugin id="org.eclipse.equinox.launcher.gtk.linux.ppc"/><plugin id="org.eclipse.equinox.launcher.gtk.linux.arm"/>
</excludes>
</configuration>
</execution>
@@ -502,7 +502,7 @@
<plugin id="org.eclipse.equinox.security.macosx"/>
<plugin id="org.eclipse.equinox.security.macosx"/>
+ <plugin id="com.jcraft.jsch"/>
-+ <plugin id="org.apache.ant"/>
++ <plugin id="org.apache.ant"/><plugin id="org.eclipse.core.filesystem.linux.ppc"/><plugin id="org.eclipse.core.filesystem.linux.ppc64"/><plugin id="org.eclipse.core.filesystem.linux.arm"/>
</excludes>
</configuration>
</execution>
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 5bb3ef5..89f9214 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -82,3 +82,141 @@
</environments>
</configuration>
</plugin>
+--- eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml.bak 2012-10-19 14:53:13.000000000 +0200
++++ eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml 2012-10-22 19:45:57.425680855 +0200
+@@ -409,6 +409,26 @@
+ install-size="0"
+ version="0.0.0"
+ fragment="true"/>
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.ppc"
++ os="linux"
++ ws="gtk"
++ arch="ppc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
++
++ <plugin
++ id="org.eclipse.equinox.launcher.gtk.linux.arm"
++ os="linux"
++ ws="gtk"
++ arch="arm"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"/>
+
+ <plugin
+ id="org.eclipse.equinox.launcher.gtk.linux.x86"
+@@ -582,6 +602,29 @@
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.ppc"
++ os="linux"
++ ws="gtk"
++ arch="ppc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++
++ <plugin
++ id="org.eclipse.swt.gtk.linux.arm"
++ os="linux"
++ ws="gtk"
++ arch="arm"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+
+--- eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml.bak 2012-10-19 14:53:13.000000000 +0200
++++ eclipse.platform.releng/features/org.eclipse.platform-feature/feature.xml 2012-10-22 19:52:12.985023364 +0200
+@@ -135,8 +135,38 @@
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.core.net.linux.ppc"
++ os="linux"
++ arch="ppc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
+
+ <plugin
++ id="org.eclipse.core.net.linux.ppc64"
++ os="linux"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
++ id="org.eclipse.core.net.linux.arm"
++ os="linux"
++ arch="arm"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++ <plugin
+ id="org.eclipse.core.resources"
+ download-size="0"
+ install-size="0"
+@@ -396,7 +426,36 @@
+ version="0.0.0"
+ fragment="true"
+ unpack="false"/>
+-
++
++ <plugin
++ id="org.eclipse.core.filesystem.linux.ppc"
++ os="linux"
++ arch="ppc"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++<plugin
++ id="org.eclipse.core.filesystem.linux.ppc64"
++ os="linux"
++ arch="ppc64"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
++<plugin
++ id="org.eclipse.core.filesystem.linux.arm"
++ os="linux"
++ arch="arm"
++ download-size="0"
++ install-size="0"
++ version="0.0.0"
++ fragment="true"
++ unpack="false"/>
++
+ <plugin
+ id="org.eclipse.core.filesystem.linux.x86_64"
+ os="linux"
diff --git a/eclipse.spec b/eclipse.spec
index 702da47..c844b98 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -78,7 +78,7 @@ fi;
Summary: An open, extensible IDE
Name: eclipse
Version: %{eclipse_version}
-Release: 6%{?dist}
+Release: 7%{?dist}
License: EPL
Group: Development/Tools
URL: http://www.eclipse.org/
@@ -528,11 +528,6 @@ sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this,
sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, serviceProps)/ctxt.getBundleContext().registerService(PropertiesProvider.class.getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb17/org/eclipse/equinox/ds/tests/tb17/Worker.java
-# Partially covered by https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
-sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml
-sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}/pom.xml
-
-
# remove git from cbi build. It was explained earlier why.
sed -i -e "s@ org.eclipse.egit.core;bundle-version=\"1.3.0\";resolution:=optional@ org.eclipse.ui@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
sed -i -e "s@ org.eclipse.jgit;bundle-version=\"1.3.0\";resolution:=optional,@ org.eclipse.ui,@" eclipse.platform.releng/bundles/org.eclipse.releng.tools/META-INF/MANIFEST.MF
@@ -565,6 +560,15 @@ popd
pushd rt.equinox.binaries
%_secondary gtk.linux.x86 x86 arm
popd
+
+# Partially covered by https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
+sed -i -e "s/1407/1503/" rt.equinox.framework/launcher-binary-parent/pom.xml
+sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launcher.gtk.linux.%{eclipse_arch}/pom.xml
+
+#hack - there should be a patch providing a profile for each arch
+sed -i -e "s/x86_64/%{eclipse_arch}/" rt.equinox.framework/bundles/org.eclipse.equinox.executable/pom.xml
+mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
+
%build
export MAVEN_OPTS=-Xmx2048m
@@ -1405,6 +1409,10 @@ rm -rf %{_bindir}/efj/
%{_mavendepmapfragdir}/%{name}-equinox-osgi
%changelog
+* Mon Oct 22 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-7
+- Moved launcher version change after secondary fragments creation.
+- Created some directories when creating secondary fragments.
+
* Fri Oct 19 2012 Krzysztof Daniel <kdaniel at redhat.com> 1:4.2.1-6
- Correct the glassfish version.
More information about the scm-commits
mailing list