diff --git a/eclipse-egit-github.spec b/eclipse-egit-github.spec index b254fcb..69f6e86 100644 --- a/eclipse-egit-github.spec +++ b/eclipse-egit-github.spec @@ -2,13 +2,17 @@ Name: eclipse-egit-github Version: 4.8.0 -Release: 1%{?dist} +Release: 2%{?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 -BuildArch: noarch + +# Avoid unnecessary dep on wikitext from doc bundle +Patch0: remove-wikitext-dep.patch + +BuildArch: noarch BuildRequires: tycho BuildRequires: maven-antrun-plugin @@ -17,7 +21,6 @@ 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} @@ -29,6 +32,7 @@ and Gists. %prep %setup -q -n egit-github-%{version}.%{version_suffix} +%patch0 %pom_xpath_remove "pom:repositories" @@ -38,11 +42,6 @@ and Gists. # remove dependencies for maven-antrun-plugin %pom_remove_dep ant:optional org.eclipse.mylyn.github.doc -# change upper version from 2.0.0 to 3.0.0 for github.doc -pushd org.eclipse.mylyn.github.doc/META-INF -sed -i '/eclipse.mylyn/ { s/2.0.0/3.0.0/ }' MANIFEST.MF -popd - %build %mvn_build -j @@ -58,6 +57,9 @@ popd %changelog +* Fri Jun 23 2017 Mat Booth - 4.8.0-2 +- Avoid unnecessary dep on Mylyn Wikitext + * Fri Jun 16 2017 Mat Booth - 4.8.0-1 - Update to Oxygen release diff --git a/remove-wikitext-dep.patch b/remove-wikitext-dep.patch new file mode 100644 index 0000000..0358cd8 --- /dev/null +++ b/remove-wikitext-dep.patch @@ -0,0 +1,8 @@ +--- 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