From 43ad85b4a3233736c5af6367844d95a3aaea6003 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Apr 02 2020 22:29:45 +0000
Subject: Make the requirement on felix-scr more strict


---

diff --git a/eclipse.spec b/eclipse.spec
index 403ac97..f14ebfa 100644
--- a/eclipse.spec
+++ b/eclipse.spec
@@ -42,7 +42,7 @@ Epoch:                  1
 Summary:        An open, extensible IDE
 Name:           eclipse
 Version:        4.15
-Release:        4%{?dist}
+Release:        5%{?dist}
 License:        EPL-2.0
 URL:            http://www.eclipse.org/
 
@@ -166,7 +166,7 @@ BuildRequires: apache-commons-jxpath
 BuildRequires: osgi(org.apache.felix.gogo.shell) >= 1.1.0
 BuildRequires: osgi(org.apache.felix.gogo.command) >= 1.0.2
 BuildRequires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0
-BuildRequires: osgi(org.apache.felix.scr) >= 2.1.16
+BuildRequires: felix-scr = 2.1.16-4
 BuildRequires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
 BuildRequires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
 BuildRequires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
@@ -254,7 +254,7 @@ Requires: apache-commons-jxpath
 Requires: osgi(org.apache.felix.gogo.shell) >= 1.1.0
 Requires: osgi(org.apache.felix.gogo.command) >= 1.0.2
 Requires: osgi(org.apache.felix.gogo.runtime) >= 1.1.0
-Requires: osgi(org.apache.felix.scr) >= 2.1.16
+Requires: felix-scr = 2.1.16-4
 Requires: osgi(org.eclipse.jetty.util) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.server) >= %{_jetty_version}
 Requires: osgi(org.eclipse.jetty.http) >= %{_jetty_version}
@@ -288,13 +288,6 @@ Requires: httpcomponents-core
 Requires: httpcomponents-client
 Requires: osgi(org.tukaani.xz)
 
-# Provides/obsoletes added in F26
-# This is the best place to add this because adding it to the nls RPMs causes every
-# single language pack to be installed, which is not desireable -- it needs to be
-# obsoleted by exactly one thing.
-Provides:  eclipse-nls = %{version}-%{release}
-Obsoletes: eclipse-nls < %{version}-%{release}
-
 # Obsoletes added in F31
 Obsoletes: eclipse-epp-logging <= 2.0.8-4
 Obsoletes: eclipse-abrt <= 0.0.3-10
@@ -1058,6 +1051,9 @@ echo "%{version}-%{release}" > %{buildroot}%{_eclipsedir}/.pkgs/Distro%{?dist}
 %{_eclipsedir}/plugins/org.eclipse.osgi.util_*
 
 %changelog
+* Thu Apr 02 2020 Mat Booth <mat.booth@redhat.com> - 1:4.15-5
+- Make the requirement on felix-scr more strict
+
 * Thu Apr 02 2020 Mat Booth <mat.booth@redhat.com> - 1:4.15-4
 - Allow library detector to build on Java 11