[eclipse/cbi] Change the version tollerance of org.eclipse.ui.intro Reduce the first build to only what's needed.

Krzysztof Daniel kdaniel at fedoraproject.org
Mon Aug 6 09:47:01 UTC 2012


commit cdfdcb524f95652c0116919ae7a1e725f3ae2d4c
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Fri Aug 3 10:26:09 2012 +0200

    Change the version tollerance of org.eclipse.ui.intro
    Reduce the first build to only what's needed.

 eclipse.spec |   25 ++++++++++++++++++++++++-
 1 files changed, 24 insertions(+), 1 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 92ffb6e..ce51672 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -341,6 +341,10 @@ sed -i -e "s/ctxt.getBundleContext().registerService(PropertiesProvider.class.ge
 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.x86_64/pom.xml
 
+
+#https://bugs.eclipse.org/bugs/show_bug.cgi?id=386503
+sed -i -e "s/3.6.0,4.0.0/3.0.0,4.0.0/" eclipse.platform.ua/org.eclipse.ui.intro/META-INF/MANIFEST.MF
+
 %build
 mvn-local -f eclipse-parent/pom.xml \
    install \
@@ -350,15 +354,34 @@ mvn-local -f maven-cbi-plugin/pom.xml \
    install \
    -Dmaven.local.mode=true 
 
+#workaround for https://bugs.eclipse.org/bugs/show_bug.cgi?id=386377
+pushd rt.equinox.framework/bundles/org.eclipse.equinox.executable
 mvn-local install \
    -Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch}  \
-   -Dmaven.local.mode=true 
+   -Dmaven.local.mode=true
+popd 
 
 mvn-local clean install \
    -Dmaven.test.skip=true -Dnative=linux.gtk.%{_arch}  \
    -Dmaven.local.mode=true 
 
 %install
+
+pushd TMP/org.eclipse.sdk.epp/target/products/org.eclipse.sdk.epp/linux/gtk/%{_arch}/eclipse
+    ./eclipse -application org.eclipse.equinox.p2.director \
+        -repository file://`pwd`/../../../../../../repository \
+        -installIU org.eclipse.platform \
+        -destination $RPM_BUILD_ROOT/usr/%{_libdir}/eclipse \
+        -profile PlatformProfile \
+        -profileProperties org.eclipse.update.install.features=true \
+        -bundlepool $RPM_BUILD_ROOT/usr/%{_libdir}/eclipse \
+        -p2.os linux \
+        -p2.ws gtk \
+        -p2.arch %{_arch} \
+        -roaming
+popd
+
+
 exit 0;
 export JAVA_HOME=%{java_home}
 ant -DdestDir=$RPM_BUILD_ROOT -Dprefix=/usr -Dmultilib=true installSDKinDropins


More information about the scm-commits mailing list