diff --git a/eclipse-egit-github.spec b/eclipse-egit-github.spec index 753d90b..bfa4832 100644 --- a/eclipse-egit-github.spec +++ b/eclipse-egit-github.spec @@ -1,16 +1,13 @@ -%global version_suffix 201706111038-r +%global version_suffix 201710071750-r Name: eclipse-egit-github -Version: 4.8.0 -Release: 3%{?dist} +Version: 4.9.0 +Release: 1%{?dist} Summary: Eclipse EGit Mylyn GitHub Connector License: EPL URL: http://www.eclipse.org/egit/ -Source0: https://git.eclipse.org/c/egit/egit-github.git/snapshot/egit-github-%{version}.%{version_suffix}.tar.xz - -# Avoid unnecessary dep on wikitext from doc bundle -Patch0: remove-wikitext-dep.patch +Source0: https://git.eclipse.org/c/egit/egit-github.git/snapshot/egit-github-v%{version}.%{version_suffix}.tar.xz BuildArch: noarch @@ -21,6 +18,7 @@ BuildRequires: hamcrest BuildRequires: eclipse-egit >= %{version} BuildRequires: eclipse-jgit >= %{version} BuildRequires: eclipse-mylyn +BuildRequires: eclipse-mylyn-docs-wikitext Requires: eclipse-platform Requires: eclipse-egit >= %{version} @@ -31,8 +29,7 @@ Create task repositories for working with GitHub issues and Gists. %prep -%setup -q -n egit-github-%{version}.%{version_suffix} -%patch0 +%setup -q -n egit-github-v%{version}.%{version_suffix} %pom_xpath_remove "pom:repositories" @@ -42,6 +39,8 @@ and Gists. # remove dependencies for maven-antrun-plugin %pom_remove_dep ant:optional org.eclipse.mylyn.github.doc +%mvn_package "::pom::" __noinstall + %build %mvn_build -j @@ -57,6 +56,9 @@ and Gists. %changelog +* Tue Nov 21 2017 Mat Booth - 4.9.0-1 +- Update to latest upstream version + * Wed Jul 26 2017 Fedora Release Engineering - 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 0358cd8..0000000 --- a/remove-wikitext-dep.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF.orig 2017-06-23 17:26:03.984235598 +0100 -+++ org.eclipse.mylyn.github.doc/META-INF/MANIFEST.MF 2017-06-23 17:26:19.263068316 +0100 -@@ -5,5 +5,3 @@ - Bundle-SymbolicName: org.eclipse.mylyn.github.doc;singleton:=true - Bundle-Version: 4.8.0.201706111038-r - Bundle-Vendor: %providerName --Require-Bundle: org.eclipse.mylyn.wikitext.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional, -- org.eclipse.mylyn.wikitext.mediawiki.core;bundle-version="[1.3.0,2.0.0)";resolution:=optional diff --git a/sources b/sources index d50f457..d4d68c9 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (egit-github-4.8.0.201706111038-r.tar.xz) = 134df0f3774a13f99903bf699fe4f4e5aeee0fae72fb71ca9038de51c783de10df0f589e40bacbce0ccc6cca6e39056dc993f95cd44b64580469efcef3186903 +SHA512 (egit-github-v4.9.0.201710071750-r.tar.xz) = 60572c49d583bdf4301561f19201812ffd45bb70b54944f8257698188c9e203cff9904fc8e2aff169e9fb9eedfd731c714be792dcf588ce075943a7cfe022199