From 85eec4f786e9963c5d1d33aeed8ac74ee0fc6096 Mon Sep 17 00:00:00 2001 From: Mat Booth Date: Apr 02 2020 22:23:01 +0000 Subject: Add obsoletes on github/mylyn extension --- diff --git a/eclipse-egit.spec b/eclipse-egit.spec index 3eb01f8..fd68db0 100644 --- a/eclipse-egit.spec +++ b/eclipse-egit.spec @@ -2,7 +2,7 @@ Name: eclipse-egit Version: 5.7.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Eclipse Git Integration License: EPL-2.0 @@ -25,8 +25,9 @@ BuildArch: noarch # Upstream Eclipse no longer supports non-64bit arches ExcludeArch: s390 %{arm} %{ix86} -# Obsoletes added in F31 +# Obsoletes added in F32 Obsoletes: %{name}-mylyn <= 5.6.0-2 +Obsoletes: %{name}-github <= 5.6.0-2 %description The eclipse-egit package contains Eclipse plugins for @@ -81,6 +82,9 @@ sed -i -e '/org\.junit/s/4\.13/4.12/' $(grep -r -l --include MANIFEST.MF org.jun %doc README.md %changelog +* Thu Apr 02 2020 Mat Booth - 5.7.0-2 +- Add obsoletes on github/mylyn extension + * Mon Mar 23 2020 Mat Booth - 5.7.0-1 - Update to latest upstream release