From 3446dc9a62ef73d805685cb81c6311f229b37508 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jul 03 2017 18:44:11 +0000
Subject: Update to final Oxygen release

Bump jetty requirement

---

diff --git a/eclipse.spec b/eclipse.spec
index 61a8515..4b38dce 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -6,9 +6,9 @@
 Epoch:                  1
 
 %global eb_commit       2ec387778205043124434190b43f747551fd36fc
-%global eclipse_tag     S4_7_0_RC4a
+%global eclipse_tag     R4_7
 
-%global _jetty_version  9.4.3
+%global _jetty_version  9.4.6
 %global _lucene_version 6.1.0
 
 %ifarch %{ix86}
@@ -38,7 +38,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.7.0
-Release:        0.14%{?dist}
+Release:        1%{?dist}
 License:        EPL
 URL:            http://www.eclipse.org/
 
@@ -128,8 +128,9 @@ BuildRequires: tycho
 BuildRequires: tycho-extras
 BuildRequires: cbi-plugins
 BuildRequires: maven-antrun-plugin
-BuildRequires: maven-enforcer-plugin
+BuildRequires: maven-assembly-plugin
 BuildRequires: maven-dependency-plugin
+BuildRequires: maven-enforcer-plugin
 BuildRequires: maven-install-plugin
 BuildRequires: xml-maven-plugin
 BuildRequires: rhino
@@ -291,7 +292,7 @@ Requires: %{name}-swt = %{epoch}:%{version}-%{release}
 Requires: %{name}-equinox-osgi = %{epoch}:%{version}-%{release}
 Requires: httpcomponents-core
 Requires: httpcomponents-client
-Requires: osgi(org.tukaani.xz) >= 1.6
+Requires: osgi(org.tukaani.xz)
 
 # Provides/obsoletes added in F26
 # This is the best place to add this because adding it to the nls RPMs causes every
@@ -580,7 +581,7 @@ done
 mkdir rhino
 pushd rhino
 xmvn -B -o install:install-file -Dfile=%{_root_datadir}/java/rhino.jar -Dpackaging=jar \
-  -DgroupId=org.mozilla -DartifactId=rhino -Dversion=1.7R4
+  -DgroupId=org.mozilla -DartifactId=rhino -Dversion=1.7.7.1
 popd
 %endif
 
@@ -705,6 +706,7 @@ cat >> eclipse.ini <<EOF
 -Dorg.eclipse.equinox.p2.reconciler.dropins.directory=%{_datadir}/eclipse/dropins
 -Dp2.fragments=%{_eclipsedir}/droplets,%{_datadir}/eclipse/droplets
 -Declipse.p2.skipMovedInstallDetection=true
+-Dosgi.resolver.usesMode=ignore
 EOF
 
 popd #eclipse
@@ -712,6 +714,11 @@ popd #eclipse
 %install
 %mvn_install
 
+%if 0%{?rhel}
+# Quote paths that contain spaces, necessary on rhel
+sed -i -e 's|\(%{_prefix}.*\)|"\1"|' .mfiles*
+%endif
+
 # Some directories we need
 install -d -m 755 $RPM_BUILD_ROOT%{_sysconfdir}
 install -d -m 755 $RPM_BUILD_ROOT%{_jnidir}
@@ -1047,6 +1054,10 @@ fi
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Fri Jun 30 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-1
+- Update to final Oxygen release
+- Bump jetty requirement
+
 * Thu Jun 15 2017 Mat Booth <mat.booth@redhat.com> - 1:4.7.0-0.14
 - Update to latest release candidate build
 - Rebuild for latest EMF and ECF
diff --git a/get-eclipse.sh b/get-eclipse.sh
index 8c0f59c..1c9be80 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=S4_7_0_RC4a
+TAG=R4_7
 
 rm -rf R4_platform-aggregator-$TAG
 rm -rf R4_platform-aggregator-$TAG.tar.xz
diff --git a/sources b/sources
index 6ded4e2..ee34fa5 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
 SHA512 (org.eclipse.linuxtools.eclipse-build-2ec387778205043124434190b43f747551fd36fc.tar.xz) = ce351ac1658304b9d2661dde73d7f0bd3e7e57c690cfac561bf08f4d14a3db0b7ffe0cac27d75f4ef7b31fefd7ebe65383e68873f8e0083758949dd7ec8f46b0
-SHA512 (R4_platform-aggregator-S4_7_0_RC4a.tar.xz) = e1b964d00e02511499a00d41fdc33ab522349046be1fd6e90b0fe3b233d120016a2353a668d3493720b381c3639eb84da2793c6b2dc3044bdcbf037cf1bdd17f
+SHA512 (R4_platform-aggregator-R4_7.tar.xz) = 1d05f76b707eee35af2d684353c38bf3777ba6c10e75270bd14a4e75f93a8d54d95ba06bc6ca8846c5f02ff0c2b0b529e1f3376b570e101e8163cf0a280a036b