diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch index 74f2ad7..a1c5e5d 100644 --- a/eclipse-secondary-arches.patch +++ b/eclipse-secondary-arches.patch @@ -282,7 +282,7 @@ + generate-resources + + -+ ++ + + + @@ -336,7 +336,7 @@ + generate-resources + + -+ ++ + + + @@ -391,7 +391,7 @@ + generate-resources + + -+ ++ + + + @@ -435,7 +435,7 @@ defaultJava=DEFAULT_JAVA_EXEC OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" ;; -+ "armv*") ++ armv*) + defaultOSArch="arm" + defaultJava=DEFAULT_JAVA_EXEC + OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch" diff --git a/eclipse.spec b/eclipse.spec index 9fb656e..710b5f5 100644 --- a/eclipse.spec +++ b/eclipse.spec @@ -28,7 +28,7 @@ Epoch: 1 # Set this flag to 1 if you want to build Eclipse without dependency to eclipse-pde # Some parts (help) will not be built, and second run will be required, but this # is a way to bootstrap Eclipse on secondary archs. -%global bootstrap 0 +%global bootstrap 1 # FIXME: update java packaging guidelines for this. See # fedora-devel-java-list discussion in September 2008. @@ -65,7 +65,7 @@ fi; Summary: An open, extensible IDE Name: eclipse Version: %{eclipse_version} -Release: 0.1.git20121217%{?dist} +Release: 0.2.git20121217%{?dist} License: EPL Group: Development/Tools URL: http://www.eclipse.org/ @@ -546,6 +546,7 @@ sed -i -e "s/1500/1503/" rt.equinox.framework/bundles/org.eclipse.equinox.launch #hack - there should be a patch providing a profile for each arch mkdir -p rt.equinox.framework/bundles/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch} +mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch} sed -i -e "s/org.apache.jasper.glassfish/org.glassfish.web.javax.servlet.jsp/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml sed -i -e "s/javax.annotation/org.apache.geronimo.specs.geronimo-annotation_1.1_spec/" eclipse.platform.common/bundles/org.eclipse.platform.doc.isv/pom.xml @@ -1349,6 +1350,11 @@ rm -rf %{_bindir}/efj/ %{_mavendepmapfragdir}/%{name}-equinox-osgi %changelog +* Wed Jan 2 2013 Krzysztof Daniel 1:4.2.2-0.2.git20121217 +- Enable bootstrap (for the purpose of arm build). +- Fix the launcher build for arm. +- Fix the s390 build issue. + * Fri Dec 21 2012 Krzysztof Daniel 1:4.2.2-0.1.git20121217 - Update to pre SR2.