From b6e839f5d72fca9503eb96c6c951a940d0f0adb4 Mon Sep 17 00:00:00 2001
From: Mat Booth <mat.booth@redhat.com>
Date: Sep 17 2019 16:08:15 +0000
Subject: Build against OSGi R7 APIs


---

diff --git a/felix-shell.spec b/felix-shell.spec
index e890370..d8fd199 100644
--- a/felix-shell.spec
+++ b/felix-shell.spec
@@ -2,7 +2,7 @@
 
 Name:           felix-shell
 Version:        1.4.3
-Release:        14%{?dist}
+Release:        15%{?dist}
 Summary:        Apache Felix Shell Service
 License:        ASL 2.0
 URL:            http://felix.apache.org
@@ -10,14 +10,11 @@ Source0:        http://archive.apache.org/dist/felix/%{bundle}-%{version}-source
 
 BuildArch: noarch
 
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: jpackage-utils
-BuildRequires: maven-local
-BuildRequires: felix-osgi-core
-BuildRequires: felix-osgi-compendium
-BuildRequires: maven-plugin-bundle
-BuildRequires: felix-parent
-BuildRequires: mockito
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
+BuildRequires:  mvn(org.osgi:osgi.cmpn)
+BuildRequires:  mvn(org.osgi:osgi.core)
 
 %description
 A simple OSGi command shell service.
@@ -33,6 +30,10 @@ This package contains API documentation for %{name}.
 
 %pom_remove_plugin org.codehaus.mojo:rat-maven-plugin
 
+# Use latest OSGi implementation
+%pom_change_dep :org.osgi.core org.osgi:osgi.core
+%pom_change_dep :org.osgi.compendium org.osgi:osgi.cmpn
+
 %mvn_file :%{bundle} "felix/%{bundle}"
 
 %build
@@ -42,12 +43,15 @@ This package contains API documentation for %{name}.
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE NOTICE DEPENDENCIES
+%license LICENSE NOTICE
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 
 %changelog
+* Tue Sep 17 2019 Mat Booth <mat.booth@redhat.com> - 1.4.3-15
+- Build against OSGi R7 APIs
+
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.4.3-14
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild