From 40542303befba9f191bdaac6f2557bbfbbd6cd52 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Fri, 15 Sep 2017 15:48:29 +0100
Subject: [PATCH] Update to Oxygen.1 release Relax restriction on objectweb-asm

---
 eclipse-mockito.patch      |  4 ++--
 eclipse-test-support.patch | 12 ++++++------
 eclipse.spec               | 16 ++++++++++++----
 get-eclipse.sh             |  7 ++-----
 sources                    |  2 +-
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/eclipse-mockito.patch b/eclipse-mockito.patch
index d7f796e..9f2c626 100644
--- a/eclipse-mockito.patch
+++ b/eclipse-mockito.patch
@@ -36,8 +36,8 @@
 + org.hamcrest.core,
 + org.mockito.mockito-core,
   org.eclipse.equinox.preferences;bundle-version="3.5.200",
-  org.eclipse.ui.forms
- Bundle-ActivationPolicy: lazy
+  org.eclipse.ui.forms,
+  org.eclipse.ui.views.properties.tabbed
 --- eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml.orig	2017-04-04 17:30:21.859313175 +0100
 +++ eclipse.platform.releng/features/org.eclipse.test-feature/feature.xml	2017-04-04 17:30:47.748038958 +0100
 @@ -75,7 +75,7 @@
diff --git a/eclipse-test-support.patch b/eclipse-test-support.patch
index 494acf2..2fbac97 100644
--- a/eclipse-test-support.patch
+++ b/eclipse-test-support.patch
@@ -130,7 +130,7 @@
      <echo message="current.build.repo: ${current.build.repo}" />
  
  
-@@ -1902,6 +1875,7 @@
+@@ -1887,6 +1860,7 @@
      -->
      <antcall target="quickTests" />
      <antcall target="longRunningTests" />
@@ -138,7 +138,7 @@
  
    </target>
  
-@@ -1963,6 +1937,8 @@
+@@ -1948,6 +1922,8 @@
      <antcall target="jdttext" />
      <antcall target="jdtuirefactoring" />
    </target>
@@ -147,7 +147,7 @@
    <target
      name="quickTests"
      depends="init">
-@@ -2072,6 +2048,20 @@
+@@ -2057,6 +2033,20 @@
  
    </target>
  
@@ -168,7 +168,7 @@
    <!--
      admittedly, not quite all of 'platform', but for
      now serves dual purpose of a "short set" of tests, that area
-@@ -2080,8 +2070,6 @@
+@@ -2065,8 +2055,6 @@
    <target
      name="platform"
      depends="init">
@@ -177,7 +177,7 @@
  
      <antcall target="ant" />
      <antcall target="antui" />
-@@ -2114,7 +2102,6 @@
+@@ -2099,7 +2087,6 @@
      <antcall target="e4CssSwt" />
      <antcall target="e4UI" />
      <antcall target="equinoxds" />
@@ -185,7 +185,7 @@
      <antcall target="bidi" />
      <antcall target="ltkuirefactoringtests" />
      <antcall target="ltkcorerefactoringtests" />
-@@ -2130,7 +2117,6 @@
+@@ -2115,7 +2102,6 @@
      <antcall target="osgi" />
      <antcall target="coreresources" />
      <antcall target="equinoxp2" />
diff --git a/eclipse.spec b/eclipse.spec
index fa7ada6..e716c18 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -1,12 +1,12 @@
 # Set to 1 to build Eclipse without circular dependency to eclipse-pde, API
 # generation and docs will not be built and a second run will be required, but
 # this is a way to bootstrap Eclipse on secondary archs.
-%global bootstrap       0
+%global bootstrap       1
 
 Epoch:                  1
 
 %global eb_commit       2ec387778205043124434190b43f747551fd36fc
-%global eclipse_tag     R4_7
+%global eclipse_tag     S4_7_1_RC4
 
 %global _jetty_version  9.4.6
 %global _lucene_version 6.1.0
@@ -37,8 +37,8 @@ Epoch:                  1
 
 Summary:        An open, extensible IDE
 Name:           eclipse
-Version:        4.7.0
-Release:        4%{?dist}
+Version:        4.7.1
+Release:        1%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -607,6 +607,10 @@ sed -i -e '/org.apache.felix.service.command/s/;status=provisional//' rt.equinox
 sed -i '18,47d' eclipse.platform.releng.tychoeclipsebuilder/eclipse-junit-tests/src/main/assembly/assembly.xml
 %endif
 
+# Relax dep on objectweb-asm
+sed -i -e '/org.objectweb.asm/s/;.*"//' \
+  eclipse.pde.ui/apitools/org.eclipse.pde.api.tools{,.generator,.tests}/META-INF/MANIFEST.MF
+
 # Use system osgi.annotation lib
 ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi/osgi/
 ln -s %{_javadir}/osgi-annotation/osgi.annotation.jar rt.equinox.framework/bundles/org.eclipse.osgi.services/lib/
@@ -1054,6 +1058,10 @@ fi
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri Sep 15 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.1-1
+- Update to Oxygen.1 release
+- Relax restriction on objectweb-asm
+
 * Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1:4.7.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
 
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 1c9be80..f9044a5 100755
--- a/get-eclipse.sh
+++ b/get-eclipse.sh
@@ -1,18 +1,15 @@
 #!/bin/bash
 set -e
 AGGREGATOR_PATH=git://git.eclipse.org/gitroot/platform/eclipse.platform.releng.aggregator.git
-TAG=R4_7
+TAG=S4_7_1_RC4
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
 
-git clone --depth 1 --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG
+git clone --recursive -j2 --branch $TAG $AGGREGATOR_PATH R4_platform-aggregator-$TAG
 
 pushd R4_platform-aggregator-$TAG
 
-git submodule init
-git submodule update
-
 rm -rf production
 
 # Comment this line to get a shallow clone.
diff --git a/sources b/sources
index ee34fa5..b8c9a31 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
-SHA512 (R4_platform-aggregator-R4_7.tar.xz) = 1d05f76b707eee35af2d684353c38bf3777ba6c10e75270bd14a4e75f93a8d54d95ba06bc6ca8846c5f02ff0c2b0b529e1f3376b570e101e8163cf0a280a036b
+SHA512 (R4_platform-aggregator-S4_7_1_RC4.tar.xz) = 33fc4ab59e51c086578129499a7562ca29967229705e86910318010d7adfe8b5f04e31d403970d4ecfd8f6ec8ad56fe3bf49ce997562599d6e80ec04266d9911