[eclipse/eclipse-luna] Update to Luna SR1

Mat Booth mbooth at fedoraproject.org
Mon Sep 29 16:50:15 UTC 2014 

commit 7c3fd0e248e571a5d1e34b33c74729aa0563fdee
Author: Mat Booth <mat.booth at redhat.com>
Date:   Mon Sep 29 17:19:28 2014 +0100

    Update to Luna SR1
    
    - Drop upstreamed patch and fix permissions on appdata files

 eclipse-bug-438992.patch       |   96 ----------------------------------------
 eclipse-secondary-arches.patch |   48 +++-----------------
 eclipse-test-support.patch     |    6 +-
 eclipse.spec                   |   61 +++++++++++++------------
 get-eclipse.sh                 |    3 +-
 sources                        |    2 +-
 6 files changed, 43 insertions(+), 173 deletions(-)
---
diff --git a/eclipse-secondary-arches.patch b/eclipse-secondary-arches.patch
index 5486bd8..b069b20 100644
--- a/eclipse-secondary-arches.patch
+++ b/eclipse-secondary-arches.patch
@@ -103,13 +103,12 @@ diff --git a/eclipse.platform.swt.binaries/pom.xml b/eclipse.platform.swt.binari
 index 7dd0536..66d79ee 100644
 --- a/eclipse.platform.swt.binaries/pom.xml
 +++ b/eclipse.platform.swt.binaries/pom.xml
-@@ -53,6 +53,9 @@
-     <module>bundles/org.eclipse.swt.gtk.linux.ppc64</module>
+@@ -54,6 +54,8 @@
+     <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
      <module>bundles/org.eclipse.swt.gtk.linux.s390</module>
      <module>bundles/org.eclipse.swt.gtk.linux.s390x</module>
 +    <module>bundles/org.eclipse.swt.gtk.linux.arm</module>
 +    <module>bundles/org.eclipse.swt.gtk.linux.aarch64</module>
-+    <module>bundles/org.eclipse.swt.gtk.linux.ppc64le</module>
      <module>bundles/org.eclipse.swt.gtk.linux.x86</module>
      <module>bundles/org.eclipse.swt.gtk.linux.x86_64</module>
      <module>bundles/org.eclipse.swt.gtk.solaris.sparc</module>
@@ -117,16 +116,15 @@ diff --git a/rt.equinox.framework/pom.xml b/rt.equinox.framework/pom.xml
 index b46cdc6..0fb36a5 100644
 --- a/rt.equinox.framework/pom.xml
 +++ b/rt.equinox.framework/pom.xml
-@@ -55,6 +55,9 @@
+@@ -55,6 +55,8 @@
      <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.aix.ppc64</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.hpux.ia64</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.arm</module>
 +    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.aarch64</module>
-+    <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc</module>
      <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64</module>
-     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.s390</module>
+     <module>bundles/org.eclipse.equinox.launcher.gtk.linux.ppc64le</module>
 diff --git a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml b/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
 index f5fb504..1187e84 100644
 --- a/eclipse.platform.swt/bundles/org.eclipse.swt/buildFragment.xml
@@ -143,22 +141,12 @@ diff --git a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml b/eclip
 index 7e1f520..734dd10 100644
 --- a/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
 +++ b/eclipse.platform.ui/features/org.eclipse.e4.rcp/feature.xml
-@@ -409,6 +409,36 @@
+@@ -419,6 +419,26 @@
           install-size="0"
           version="0.0.0"
           fragment="true"/>
 +         
 +   <plugin
-+         id="org.eclipse.equinox.launcher.gtk.linux.ppc64le"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64le"
-+         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"
@@ -180,23 +168,12 @@ index 7e1f520..734dd10 100644
  
     <plugin
           id="org.eclipse.equinox.launcher.gtk.linux.x86"
-@@ -583,6 +613,39 @@
+@@ -583,6 +613,28 @@
           version="0.0.0"
           fragment="true"
           unpack="false"/>
 +         
 +   <plugin
-+         id="org.eclipse.swt.gtk.linux.ppc64le"
-+         os="linux"
-+         ws="gtk"
-+         arch="ppc64le"
-+         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"
@@ -224,19 +201,6 @@ diff --git a/rt.equinox.framework/features/org.eclipse.equinox.executable.featur
 index 29d3871..45526c8 100644
 --- a/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
 +++ b/rt.equinox.framework/features/org.eclipse.equinox.executable.feature/library/gtk/build.sh
-@@ -104,6 +104,12 @@
- 				[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
- 				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
- 				;;
-+			"ppc64le")
-+				defaultOSArch="ppc64le"
-+				defaultJava=DEFAULT_JAVA_EXEC
-+				[ -d /bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50 ] && defaultJavaHome="/bluebird/teamswt/swt-builddir/JDKs/PPC64/ibm-java2-ppc64-50"
-+				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
-+				;;
- 			"s390")
- 				defaultOSArch="s390"
- 				defaultJava=DEFAULT_JAVA_EXEC
 @@ -119,6 +125,16 @@
  				defaultJava=DEFAULT_JAVA_EXEC
  				OUTPUT_DIR="$EXEC_DIR/bin/$defaultWS/$defaultOS/$defaultOSArch"
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 828b5e5..940c666 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -292,8 +292,8 @@
 -# assuming metacity attaches to "current" display by default (which should have
 -# already been set by Hudson). We echo its value here just for extra reference/cross-checks.
 -
--echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin):"
--wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin" | grep -v egrep)
+-echo "Check if any window managers are running (xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm):"
+-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
 -echo "Window Manager processes: $wmpss"
 -echo
 -
@@ -316,7 +316,7 @@
 -echo
 -
 -echo "Triple check if any window managers are running (at least metacity should be!):"
--wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz" | grep -v egrep)
+-wmpss=$(ps -ef | egrep -i "xfwm|twm|metacity|beryl|fluxbox|compiz|kwin|openbox|icewm" | grep -v egrep)
 -echo "Window Manager processes: $wmpss"
 -echo
 -echo "extdirprop in runtest: ${extdirprop}"
diff --git a/eclipse.spec b/eclipse.spec
index 022de6c..3ffebee 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -12,9 +12,9 @@ Epoch:                  1
 
 %global eclipse_major   4
 %global eclipse_minor   4
-%global eclipse_micro   0
+%global eclipse_micro   1
 %global eb_commit       db6b9cd54787feb7cf7c7a28c80e740340213bd3
-%global eclipse_tag     R4_4
+%global eclipse_tag     R4_4_1
 %global eclipse_version %{eclipse_major}.%{eclipse_minor}.%{eclipse_micro}
 %global _jetty_version  9.0.5
 
@@ -39,7 +39,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           %{?scl_prefix}eclipse
 Version:        %{eclipse_version}
-Release:        13.2%{?dist}
+Release:        1%{?dist}
 License:        EPL
 Group:          Development/Tools
 URL:            http://www.eclipse.org/
@@ -112,10 +112,8 @@ Patch21:        %{pkg_name}-mockito.patch
 
 Patch22:        %{pkg_name}-policy-comparators.patch
 
-# https://bugs.eclipse.org/bugs/show_bug.cgi?id=438992
-Patch23:        %{pkg_name}-bug-438992.patch
-Patch24:        %{pkg_name}-webkit2-support.patch
-Patch25:        %{pkg_name}-bug-444143.patch
+Patch23:        %{pkg_name}-webkit2-support.patch
+Patch24:        %{pkg_name}-bug-444143.patch
 
 BuildRequires: rsync
 BuildRequires: make, gcc
@@ -177,7 +175,7 @@ BuildRequires: httpcomponents-client
 BuildRequires: mockito
 %if ! %{bootstrap}
 BuildRequires: %{?scl_prefix}eclipse-pde
-%endif  
+%endif
 BuildRequires: %{?scl_prefix}eclipse-license
 
 %description
@@ -328,9 +326,8 @@ tar --strip-components=1 -xf %{SOURCE1}
 %patch20
 %patch21
 %patch22
-%patch23 -p1
-%patch24
-%patch25 -p1
+%patch23
+%patch24 -p1
 
 #Disable as many things as possible to make the build faster. We care only for Eclipse.
 %pom_disable_module platform.sdk eclipse.platform.releng.tychoeclipsebuilder
@@ -411,7 +408,7 @@ done
 for dir in eclipse.platform.swt.binaries/bundles \
            rt.equinox.framework/bundles rt.equinox.binaries ; do
   utils/ensure_arch.sh "$dir" x86 arm
-  utils/ensure_arch.sh "$dir" x86_64 aarch64 ppc64le
+  utils/ensure_arch.sh "$dir" x86_64 aarch64
 done
 
 # Don't mirror stuff to the repo that we haven't built
@@ -438,14 +435,13 @@ sed -i -e '/^root\.[^l]/d' \
   rt.equinox.framework/features/org.eclipse.equinox.executable.feature/build.properties \
   eclipse.platform.releng.tychoeclipsebuilder/rcp.config/build.properties
 
-#hack - there should be a patch providing a profile for each arch
+# Hack - this can go away once upstream grows arm and aarch64 support
 mkdir -p rt.equinox.binaries/org.eclipse.equinox.executable/bin/gtk/linux/%{eclipse_arch}
 
 #pdebuild script should point to dropins
 sed -i -e "s|@DATADIR@|%{_datadir}|g" eclipse.pde.build/org.eclipse.pde.build/templates/package-build/build.properties
 
-
-#ensure that bundles with *.so libs are dirs, so no *.so is extracted into user.home
+# Ensure that bundles with native artifacts are dir-shaped, so no *.so is extracted into user.home
 for f in `find eclipse.platform.swt.binaries/bundles/org.eclipse.swt.gtk.* -name MANIFEST.MF` ; do 
     echo -e "Eclipse-BundleShape: dir\n\n" >> $f; 
 done
@@ -588,24 +584,26 @@ install -d -m 755 $RPM_BUILD_ROOT%{_bindir}
 
 # Install icons
 install -D eclipse.platform/platform/org.eclipse.platform/eclipse32.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{?scl_prefix}eclipse.png
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/32x32/apps/%{name}.png
 install -D eclipse.platform/platform/org.eclipse.platform/eclipse48.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{?scl_prefix}eclipse.png
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/48x48/apps/%{name}.png
 install -D eclipse.platform/platform/org.eclipse.platform/eclipse256.png \
-    $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png
+    $RPM_BUILD_ROOT/usr/share/icons/hicolor/256x256/apps/%{name}.png
 install -d $RPM_BUILD_ROOT/usr/share/pixmaps
-ln -s /usr/share/icons/hicolor/256x256/apps/%{?scl_prefix}eclipse.png \
-    $RPM_BUILD_ROOT/usr/share/pixmaps/%{?scl_prefix}eclipse.png
+ln -s /usr/share/icons/hicolor/256x256/apps/%{name}.png \
+    $RPM_BUILD_ROOT/usr/share/pixmaps/%{name}.png
 
-# Install desktop file and app data
+# Install desktop file
 %{?scl: sed -i -e 's/Exec=eclipse/Exec=scl enable %{scl_name} eclipse/g' desktopintegration/eclipse.desktop}
 %{?scl: sed -i -e 's/Icon=eclipse/Icon=%{?scl_prefix}eclipse/g' desktopintegration/eclipse.desktop}
 %{?scl: sed -i -e 's/Name=Eclipse/Name=%{app_name}/g' desktopintegration/eclipse.desktop}
-install -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
-install -D desktopintegration/eclipse.appdata.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
-install -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
-install -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
-desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{?scl_prefix}eclipse.desktop
+install -m644 -D desktopintegration/eclipse.desktop $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+desktop-file-validate $RPM_BUILD_ROOT/usr/share/applications/%{name}.desktop
+
+# Install appstream appdata
+install -m644 -D desktopintegration/eclipse.appdata.xml      $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse.appdata.xml
+install -m644 -D desktopintegration/eclipse-jdt.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-jdt.metainfo.xml
+install -m644 -D desktopintegration/eclipse-pde.metainfo.xml $RPM_BUILD_ROOT%{_datadir}/appdata/eclipse-pde.metainfo.xml
 
 #################################
 ### Extraced from old build.xml #
@@ -709,7 +707,6 @@ unzip eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/target/ecl
 unzip $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip -d $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/JUNIT.XSL $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/scripts/library.xml $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
-cp production/testScripts/configuration/sdk.tests/testConfigs/linux/testing.properties $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 cp utils/splitter.xsl $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing
 rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/eclipse-junit-tests-*.zip
 rm $RPM_BUILD_ROOT/%{_javadir}/eclipse-testing/runtests.bat
@@ -793,7 +790,7 @@ fi
 /usr/share/applications/*
 /usr/share/pixmaps/*
 /usr/share/icons/*/*/apps/*
-/usr/share/appdata/%{?scl_prefix}eclipse.appdata.xml
+%{_datadir}/appdata/eclipse.appdata.xml
 %{_libdir}/%{pkg_name}/eclipse
 %dir %{_libdir}/%{pkg_name}/dropins
 %dir %{_datadir}/%{pkg_name}/
@@ -1002,12 +999,12 @@ fi
 
 %files jdt
 %{_bindir}/efj
-/usr/share/appdata/%{?scl_prefix}eclipse-jdt.metainfo.xml
+%{_datadir}/appdata/eclipse-jdt.metainfo.xml
 %{_libdir}/%{pkg_name}/dropins/jdt
 
 %files pde
 %{_bindir}/%{pkg_name}-pdebuild
-/usr/share/appdata/%{?scl_prefix}eclipse-pde.metainfo.xml
+%{_datadir}/appdata/eclipse-pde.metainfo.xml
 %{_libdir}/%{pkg_name}/buildscripts
 %{_libdir}/%{pkg_name}/dropins/sdk
 %{_libdir}/%{pkg_name}/dropins/cvs
@@ -1028,6 +1025,10 @@ fi
 %{_libdir}/%{pkg_name}/plugins/org.eclipse.osgi.compatibility.state_*
 
 %changelog
+* Fri Sep 26 2014 Mat Booth <mat.booth at redhat.com> - 1:4.4.1-1
+- Update to Luna SR1
+- Drop upstreamed patch and fix permissions on appdata files
+
 * Thu Sep 18 2014 Alexander Kurtakov <akurtako at redhat.com> 1:4.4.0-13.2
 - Fix unreadable autocomplete selection.
 
diff --git a/get-eclipse.sh b/get-eclipse.sh
index dc0555f..cb74cc0 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 set -e
 AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=R4_4
+TAG=R4_4_1
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
@@ -15,6 +15,7 @@ pushd R4_platform-aggregator-$TAG
 git submodule init
 git submodule update
 
+rm -rf bootstrap streams scripts
 
 # Comment this line to get a shallow clone.
 find . -type d -name ".git" | xargs rm -rf
diff --git a/sources b/sources
index 1fcb082..c5242b0 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-d1e37d9af6848edbdd54d5988c77fa58  R4_platform-aggregator-R4_4.tar.xz
+0d857f3b64931672dca62142d7fbdbd0  R4_platform-aggregator-R4_4_1.tar.xz
 b5c946f8de3fb487cf9f385a0ae707e2  org.eclipse.linuxtools.eclipse-build-db6b9cd54787feb7cf7c7a28c80e740340213bd3.tar.bz2

More information about the scm-commits mailing list