From 35f52bbe31ebe893d6b3065224f81ec744cf1e09 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Nov 21 2017 17:45:52 +0000
Subject: Update to latest upstream version


---

diff --git a/eclipse-egit.spec b/eclipse-egit.spec
index 52593a0..213f1de 100644
--- a/eclipse-egit.spec
+++ b/eclipse-egit.spec
@@ -1,20 +1,17 @@
-%global version_suffix 201706111038-r
+%global version_suffix 201710071750-r
 
 # EGit and Mylyn have circular dependencies
 # Set this flag to build bootstrapped when Mylyn not present
 %bcond_with bootstrap
 
 Name:             eclipse-egit
-Version:          4.8.0
-Release:          3%{?dist}
+Version:          4.9.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
-
-# Avoid unnecessary dep on wikitext from doc bundle
-Patch0:           remove-wikitext-dep.patch
+Source0:          http://git.eclipse.org/c/egit/egit.git/snapshot/egit-v%{version}.%{version_suffix}.tar.xz
 
 %if %{with bootstrap}
 # Avoid dep on mylyn when bootstrapping
@@ -48,8 +45,7 @@ Git integration for mylyn.
 %endif
 
 %prep
-%setup -q -n egit-%{version}.%{version_suffix}
-%patch0
+%setup -q -n egit-v%{version}.%{version_suffix}
 
 %if %{with bootstrap}
 %patch1
@@ -94,6 +90,9 @@ Git integration for mylyn.
 %endif
 
 %changelog
+* Tue Nov 21 2017 Mat Booth <mat.booth@redhat.com> - 4.9.0-1
+- Update to latest upstream version
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 4.8.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 
diff --git a/remove-wikitext-dep.patch b/remove-wikitext-dep.patch
deleted file mode 100644
index 033c54d..0000000
--- a/remove-wikitext-dep.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-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 a/sources b/sources
index 644e109..4094f55 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (egit-4.8.0.201706111038-r.tar.xz) = 47fde6e0db784e7f9af4b56a37e8b4f4ea80367dc49287b2a5c114c00bccb74b4f058efcb5276078a739fa41d4b6d9b3c3712a016ffef820d8458f71d18f1889
+SHA512 (egit-v4.9.0.201710071750-r.tar.xz) = 34458619d2c8e360e118506535d18db73da17341bc64b7f7f9a5df0914d30c15d0d2619ab54f716982cba305e91c8d4442b652abc533c6afbe96bae58c986d91