From d8b9f50527adc381d69e36731ccb998c602f669f Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 16 2017 09:17:20 +0000
Subject: Update to Oxygen release

Update bootstrap mode

---

diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 4ed1464..1a8aabc 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -1,17 +1,18 @@
+%global version_suffix 201706111038-r
+
 # EGit and Mylyn have circular dependencies
-# EGit can build bootstrapped when Mylyn not present
-%global bootstrap 0
-%global version_suffix 201704051617-r
+# Set this flag to build bootstrapped when Mylyn not present
+%bcond_with bootstrap
 
 Name:             eclipse-egit
-Version:          4.7.0
-Release:          2%{?dist}
+Version:          4.8.0
+Release:          1%{?dist}
 Summary:          Eclipse Git Integration
 
 License:          EPL
 URL:              http://www.eclipse.org/egit
 Source0:          http://git.eclipse.org/c/egit/egit.git/snapshot/egit-%{version}.%{version_suffix}.tar.xz
-%if %{bootstrap}
+%if %{with bootstrap}
 Patch0:           remove-mylyn-dep.patch
 %endif
 
@@ -21,7 +22,7 @@ BuildRequires:    eclipse-platform >= 1:4.6.0
 BuildRequires:    eclipse-jdt
 BuildRequires:    eclipse-jgit >= %{version}
 BuildRequires:    eclipse-license
-%if ! %{bootstrap}
+%if %{without bootstrap}
 BuildRequires:    eclipse-mylyn
 BuildRequires:    eclipse-mylyn-docs-wikitext
 %endif
@@ -34,7 +35,7 @@ BuildArch:        noarch
 The eclipse-egit package contains Eclipse plugins for
 interacting with Git repositories.
 
-%if ! %{bootstrap}
+%if %{without bootstrap}
 %package mylyn
 Summary:     Git integration for mylyn.
 
@@ -44,8 +45,12 @@ Git integration for mylyn.
 
 %prep
 %setup -q -n egit-%{version}.%{version_suffix}
-%if %{bootstrap}
+
+%if %{with bootstrap}
+# Avoid dep on Mylyn when bootstrapping
 %patch0
+%pom_disable_module org.eclipse.egit.mylyn.ui
+%pom_disable_module org.eclipse.egit.mylyn-feature
 %endif
 
 %pom_xpath_remove "pom:repositories"
@@ -57,22 +62,16 @@ Git integration for mylyn.
 %pom_disable_module org.eclipse.egit.repository
 %pom_disable_module org.eclipse.egit.source-feature
 %pom_disable_module org.eclipse.egit.target
+
+# Disable tests for now
 %pom_disable_module org.eclipse.egit.core.test
 %pom_disable_module org.eclipse.egit.ui.test
 %pom_disable_module org.eclipse.egit.ui.importer.tests
 %pom_disable_module org.eclipse.egit.gitflow.test
 %pom_disable_module org.eclipse.egit.mylyn.ui.test
 
-%if %{bootstrap}
-#to avoid mylyn circular dependancy
-%pom_disable_module org.eclipse.egit.mylyn.ui
-%pom_disable_module org.eclipse.egit.mylyn-feature
-%endif
-
 %mvn_package "::pom::" __noinstall
-%if ! %{bootstrap}
 %mvn_package :*mylyn* mylyn
-%endif
 %mvn_package :* egit
 
 %build
@@ -84,12 +83,16 @@ Git integration for mylyn.
 %files -f .mfiles-egit
 %doc LICENSE README.md
 
-%if ! %{bootstrap}
+%if %{without bootstrap}
 %files mylyn -f .mfiles-mylyn
 %doc LICENSE README.md
 %endif
 
 %changelog
+* Fri Jun 16 2017 Mat Booth <mat.booth@redhat.com> - 4.8.0-1
+- Update to Oxygen release
+- Update bootstrap mode
+
 * Wed May 10 2017 Mat Booth <mat.booth@redhat.com> - 4.7.0-2
 - Regenerate symlinks
 
diff --git a/remove-mylyn-dep.patch b/remove-mylyn-dep.patch
index 43309f1..700a002 100644
--- a/remove-mylyn-dep.patch
+++ b/remove-mylyn-dep.patch
@@ -12,25 +12,11 @@ index e804799..d40ca7a 100644
 - org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
 - org.eclipse.ui.cheatsheets;bundle-version="[3.3.0,4.0.0)"
 +Require-Bundle: org.eclipse.ui.cheatsheets;bundle-version="[3.3.0,4.0.0)"
-diff --git org.eclipse.egit.repository/category.xml org.eclipse.egit.repository/category.xml
-index 223bb3f..8dc8821 100644
---- org.eclipse.egit.repository/category.xml
-+++ org.eclipse.egit.repository/category.xml
-@@ -9,9 +9,6 @@
-    <feature url="features/org.eclipse.egit.sources_0.0.0.qualifier.jar" id="org.eclipse.egit.source" version="0.0.0" patch="true">
-       <category name="EGit"/>
-    </feature>
--   <feature url="features/org.eclipse.egit.mylyn_0.0.0.qualifier.jar" id="org.eclipse.egit.mylyn" version="0.0.0">
--      <category name="EGit"/>
--   </feature>
-    <feature url="features/org.eclipse.jgit_0.0.0.qualifier.jar" id="org.eclipse.jgit" version="0.0.0" patch="true">
-       <category name="JGit"/>
-    </feature>
 diff --git org.eclipse.egit.source-feature/feature.xml org.eclipse.egit.source-feature/feature.xml
 index 6d1addf..b364ddf 100644
 --- org.eclipse.egit.source-feature/feature.xml
 +++ org.eclipse.egit.source-feature/feature.xml
-@@ -37,12 +37,6 @@
+@@ -39,12 +39,6 @@
           version="0.0.0"
           unpack="false"/>