[eclipse/cbi: 20/22] splash screen appears

[Krzysztof Daniel]

commit b56344760cd9ae2a9308779cf39f91f42b9f00dc
Author: Krzysztof Daniel <kdaniel at redhat.com>
Date:   Wed Aug 1 13:24:15 2012 +0200

    splash screen appears

 eclipse.spec |   19 ++++++++++++-------
 1 files changed, 12 insertions(+), 7 deletions(-)
---
diff --git a/eclipse.spec b/eclipse.spec
index 3c730dc..d62eb87 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -90,13 +90,13 @@ BuildRequires:  mesa-libGL-devel
 BuildRequires:  mesa-libGLU-devel
 BuildRequires:  cairo >= 1.0
 BuildRequires:  unzip
+BuildRequires:  coreutils
 BuildRequires:  desktop-file-utils
 BuildRequires:  java-devel >= 1:1.7.0
 BuildRequires:  java-javadoc >= 1:1.7.0
 BuildRequires:  libXt-devel
 BuildRequires:  webkitgtk-devel
 BuildRequires:  geronimo-annotation >= 1.0-7
-
 BuildRequires: icu4j-eclipse >= 1:4.4.2.2-11
 BuildRequires: tomcat-lib >= 7.0.25-3
 BuildRequires: ant-antlr ant-apache-bcel ant-apache-log4j ant-apache-oro ant-apache-regexp ant-apache-resolver ant-commons-logging ant-apache-bsf ant-commons-net
@@ -267,6 +267,7 @@ developing Eclipse plugins.
 %patch14
 %patch15
 
+
 #https://bugs.eclipse.org/bugs/show_bug.cgi?id=386040
 %pom_disable_module bundles/org.eclipse.equinox.http.jetty5 rt.equinox.bundles .
 %pom_disable_module bundles/org.eclipse.equinox.http.jetty6 rt.equinox.bundles .
@@ -319,7 +320,7 @@ find . -name *.class -exec rm -f {} \;
 find . -name *.so -exec rm -f {} \;
 
 
-find . -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \;
+find . -type f -name build.properties -exec sed -i -e "s/javacTarget=jsr14/javacTarget=1.5/" {} \;
 find . -name pom.xml -exec sed -i -e "s/jsr14/1.5/" {} \;
 find . -name org.eclipse.jdt.core.prefs -exec sed -i -e "s/inlineJsrBytecode=enabled/inlineJsrBytecode=disabled/" {} \;
 
@@ -329,14 +330,14 @@ sed -i -e "s/new Equinox(configuration1)/new Equinox((Map<String, ?>) (Object) c
 sed -i -e "s/new Equinox(configuration2)/new Equinox((Map<String, ?>) (Object) configuration2)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/bundles/SystemBundleTests.java
 sed -i -e "s/new Equinox(configuration)/new Equinox((Map<String, ?>) (Object) configuration)/" rt.equinox.framework/bundles/org.eclipse.osgi.tests/src/org/eclipse/osgi/tests/securityadmin/SecurityManagerTests.java
 
+#Other compilation problems caused by 1.4 -> 1.5 change
 sed -i -e "s/ctxt.getBundleContext().registerService(getClass().getName(), this, serviceProps)/ctxt.getBundleContext().registerService(getClass().getName(), this, (Dictionary<String,?>)(Object)serviceProps)/" rt.equinox.bundles/bundles/org.eclipse.equinox.ds.tests/bundles_src/tb16/org/eclipse/equinox/ds/tests/tb16/TargetProperties.java
 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
-#popd
+
+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
 
 %build
-#temporary workaorund for unpackaged version
-#mvn-rpmbuild install :tycho-buildtimestamp-jgit:jar: || echo 0
-#maven -DartifactId=tycho-buildtimestamp-jgit -DgroupId=org.eclipse.tycho.extras -Dversion=0.16.0-SNAPSHOT plugin:download
 mvn-local -f eclipse-parent/pom.xml \
    install \
    -Dmaven.local.mode=true
@@ -346,7 +347,11 @@ mvn-local -f maven-cbi-plugin/pom.xml \
    -Dmaven.local.mode=true
 
 mvn-local install \
-   -Dmaven.test.skip=true -Dnative=gtk.linux.%{arch}  \
+   -Dmaven.test.skip=true -Dnative=linux.gtk.`uname -p`  \
+   -Dmaven.local.mode=true 
+
+mvn-local clean install \
+   -Dmaven.test.skip=true -Dnative=linux.gtk.`uname -p`  \
    -Dmaven.local.mode=true 
 
 #export JAVA_HOME=%{java_home}