diff --git a/ebz535818.patch b/ebz535818.patch deleted file mode 100644 index 6cbe84d..0000000 --- a/ebz535818.patch +++ /dev/null @@ -1,37 +0,0 @@ -From aa3ab2027b7b823b18899d34a54857519019aee5 Mon Sep 17 00:00:00 2001 -From: Mat Booth -Date: Tue, 12 Jun 2018 17:32:37 +0100 -Subject: Remove unnecessary dependency on JDT annotations - -Bug: 535818 -Change-Id: Ibbfa399e30c2129df0381ae7e8e038d5878d936a -Signed-off-by: Mat Booth ---- - org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF | 1 - - org.eclipse.egit.mylyn.ui/build.properties | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF -index 1e78f6d..53f44dc 100644 ---- a/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF -+++ b/org.eclipse.egit.mylyn.ui/META-INF/MANIFEST.MF -@@ -10,7 +10,6 @@ Require-Bundle: org.eclipse.team.core, - org.eclipse.jface, - org.eclipse.core.resources, - org.eclipse.core.runtime, -- org.eclipse.jdt.annotation;bundle-version="[1.1.0,2.0.0)";resolution:=optional, - org.eclipse.ui.navigator.resources, - org.eclipse.ui.workbench, - org.eclipse.mylyn.monitor.core;bundle-version="[3.0.0,4.0.0)", -diff --git a/org.eclipse.egit.mylyn.ui/build.properties b/org.eclipse.egit.mylyn.ui/build.properties -index 383fe13..7b3c227 100644 ---- a/org.eclipse.egit.mylyn.ui/build.properties -+++ b/org.eclipse.egit.mylyn.ui/build.properties -@@ -6,4 +6,3 @@ bin.includes = META-INF/,\ - plugin.properties,\ - about.html - src.includes = about.html --additional.bundles = org.eclipse.jdt.annotation --- -cgit v1.1 - diff --git a/eclipse-egit.spec b/eclipse-egit.spec index 80f21c0..f42ae68 100644 --- a/eclipse-egit.spec +++ b/eclipse-egit.spec @@ -1,17 +1,14 @@ -%global gittag %{version}.201806211838-r +%global gittag 38d31f5c2583b294e5ea6b34f26e9ddc54492eb3 Name: eclipse-egit -Version: 5.0.1 -Release: 2%{?dist} +Version: 5.1.0 +Release: 0.1%{?dist} Summary: Eclipse Git Integration License: EPL-2.0 URL: http://www.eclipse.org/egit # Use github mirror for now, see: https://bugs.eclipse.org/bugs/show_bug.cgi?id=522144 -Source0: https://github.com/eclipse/egit/archive/v%{gittag}/egit-v%{gittag}.tar.gz - -# Fixes unnecessary dep on JDT annotations -Patch0: ebz535818.patch +Source0: https://github.com/eclipse/egit/archive/%{gittag}/egit-%{gittag}.tar.gz BuildRequires: tycho BuildRequires: maven-antrun-plugin @@ -38,8 +35,6 @@ Git integration for mylyn. %prep %setup -q -n egit-%{gittag} -%patch0 -p1 - # Fix license req sed -i -e '/license-feature-version/s/2.0.0/0.0.0/' */feature.xml @@ -82,6 +77,9 @@ sed -i -e '/license-feature-version/s/2.0.0/0.0.0/' */feature.xml %doc README.md %changelog +* Wed Aug 22 2018 Mat Booth - 5.1.0-0.1 +- Update to latest snapshot + * Thu Jul 12 2018 Fedora Release Engineering - 5.0.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild diff --git a/sources b/sources index d935ffa..baa5f2d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (egit-v5.0.1.201806211838-r.tar.gz) = 12374a4226631ac8e16629fbe7a96530f970a9661bf52ce0e86981ee809ce1e92dd7136451f6aa553634e02188794cb96ba2db41b911e88def6c747bb20df4aa +SHA512 (egit-38d31f5c2583b294e5ea6b34f26e9ddc54492eb3.tar.gz) = bce8801f7c4a5d3ccd5624dc38b13f97a3d17c065999dde43cd6dc8b986a501a377ca9c8f169de190f7da5510cde94564326cbf8db2c852f5c65a85baff28bf3