From dcf9d017768c318beda52bd3c2da539d20db3be1 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Jun 23 2017 13:21:46 +0000
Subject: Avoid unnecessary dep on Mylyn Wikitest


---

diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 1a8aabc..33b2394 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -6,14 +6,19 @@
 
 Name:             eclipse-egit
 Version:          4.8.0
-Release:          1%{?dist}
+Release:          2%{?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
+
+# Avoid unnecessary dep on wikitext from doc bundle
+Patch0:           remove-wikitext-dep.patch
+
 %if %{with bootstrap}
-Patch0:           remove-mylyn-dep.patch
+# Avoid dep on mylyn when bootstrapping
+Patch1:           remove-mylyn-dep.patch
 %endif
 
 BuildRequires:    tycho
@@ -24,7 +29,6 @@ BuildRequires:    eclipse-jgit >= %{version}
 BuildRequires:    eclipse-license
 %if %{without bootstrap}
 BuildRequires:    eclipse-mylyn
-BuildRequires:    eclipse-mylyn-docs-wikitext
 %endif
 Requires:         eclipse-platform >= 1:4.6.0
 Requires:         eclipse-jgit >= %{version}
@@ -45,10 +49,11 @@ Git integration for mylyn.
 
 %prep
 %setup -q -n egit-%{version}.%{version_suffix}
+%patch0
 
 %if %{with bootstrap}
-# Avoid dep on Mylyn when bootstrapping
-%patch0
+%patch1
+# Don't build Mylyn integration when bootstrapping
 %pom_disable_module org.eclipse.egit.mylyn.ui
 %pom_disable_module org.eclipse.egit.mylyn-feature
 %endif
@@ -89,6 +94,9 @@ Git integration for mylyn.
 %endif
 
 %changelog
+* Fri Jun 23 2017 Mat Booth <mat.booth@redhat.com> - 4.8.0-2
+- Avoid unnecessary dep on Mylyn Wikitest
+
 * Fri Jun 16 2017 Mat Booth <mat.booth@redhat.com> - 4.8.0-1
 - Update to Oxygen release
 - Update bootstrap mode
diff --git a/remove-mylyn-dep.patch b/remove-mylyn-dep.patch
index 700a002..153d77a 100644
--- a/remove-mylyn-dep.patch
+++ b/remove-mylyn-dep.patch
@@ -1,17 +1,3 @@
-diff --git org.eclipse.egit.doc/META-INF/MANIFEST.MF org.eclipse.egit.doc/META-INF/MANIFEST.MF
-index e804799..d40ca7a 100644
---- org.eclipse.egit.doc/META-INF/MANIFEST.MF
-+++ org.eclipse.egit.doc/META-INF/MANIFEST.MF
-@@ -6,8 +6,4 @@
- Bundle-Vendor: %Bundle-Vendor
- Bundle-ActivationPolicy: lazy
- Bundle-Localization: plugin
--Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
-- org.eclipse.mylyn.wikitext.core.ant;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
-- org.eclipse.mylyn.wikitext.mediawiki.core.ant;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
-- 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.source-feature/feature.xml org.eclipse.egit.source-feature/feature.xml
 index 6d1addf..b364ddf 100644
 --- org.eclipse.egit.source-feature/feature.xml
diff --git a/remove-wikitext-dep.patch b/remove-wikitext-dep.patch
new file mode 100644
index 0000000..033c54d
--- /dev/null
+++ b/remove-wikitext-dep.patch
@@ -0,0 +1,14 @@
+diff --git org.eclipse.egit.doc/META-INF/MANIFEST.MF org.eclipse.egit.doc/META-INF/MANIFEST.MF
+index e804799..d40ca7a 100644
+--- org.eclipse.egit.doc/META-INF/MANIFEST.MF
++++ org.eclipse.egit.doc/META-INF/MANIFEST.MF
+@@ -6,8 +6,4 @@
+ Bundle-Vendor: %Bundle-Vendor
+ Bundle-ActivationPolicy: lazy
+ Bundle-Localization: plugin
+-Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+- org.eclipse.mylyn.wikitext.core.ant;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+- org.eclipse.mylyn.wikitext.mediawiki.core.ant;bundle-version="[2.9.0,3.0.0)";resolution:=optional,
+- 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)"