From f4a59ea2e4f8851143b498424c1120d1483700f0 Mon Sep 17 00:00:00 2001
From: Mikolaj Izdebski <mizdebsk@redhat.com>
Date: May 13 2021 19:00:54 +0000
Subject: Merge modular branch


---

diff --git a/felix-utils.spec b/felix-utils.spec
index 4d8450e..248e1fa 100644
--- a/felix-utils.spec
+++ b/felix-utils.spec
@@ -1,3 +1,5 @@
+%bcond_with bootstrap
+
 %global bundle org.apache.felix.utils
 
 Name:           felix-utils
@@ -5,22 +7,24 @@ Version:        1.11.6
 Release:        1%{?dist}
 Summary:        Utility classes for OSGi
 License:        ASL 2.0
+URL:            https://felix.apache.org
+BuildArch:      noarch
 
-URL:            http://felix.apache.org
 Source0:        https://repo1.maven.org/maven2/org/apache/felix/%{bundle}/%{version}/%{bundle}-%{version}-source-release.tar.gz
 
 # The module org.osgi.cmpn requires implementing methods which were not
 # implemented in previous versions where org.osgi.compendium was used
 Patch0:         0000-Port-to-osgi-cmpn.patch
 
-BuildArch:      noarch
-
 BuildRequires:  maven-local
+%if %{with bootstrap}
+BuildRequires:  javapackages-bootstrap
+%else
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.felix:felix-parent:pom:)
 BuildRequires:  mvn(org.mockito:mockito-core)
 BuildRequires:  mvn(org.osgi:osgi.cmpn)
 BuildRequires:  mvn(org.osgi:osgi.core)
+%endif
 
 %description
 Utility classes for OSGi
@@ -35,6 +39,8 @@ This package contains the API documentation for %{name}.
 %setup -q -n %{bundle}-%{version}
 %patch0 -p1
 
+%pom_remove_parent
+%pom_xpath_inject pom:project "<groupId>org.apache.felix</groupId>"
 %pom_remove_plugin :apache-rat-plugin
 
 %mvn_file :%{bundle} "felix/%{bundle}"
@@ -59,6 +65,9 @@ This package contains the API documentation for %{name}.
 * Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
 
+* Wed Jan 20 2021 Marian Koncek <mkoncek@redhat.com> - 1.11.6-1
+- Update to upstream version 1.11.6
+
 * Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
 
@@ -68,9 +77,15 @@ This package contains the API documentation for %{name}.
 * Mon Mar 02 2020 Fabio Valentini <decathorpe@gmail.com> - 1.11.4-1
 - Update to version 1.11.4.
 
+* Wed Jan 29 2020 Marian Koncek <mkoncek@redhat.com> - 1.11.4-1
+- Update to upstream version 1.11.4
+
 * Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.11.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
 
+* Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11.2-2
+- Mass rebuild for javapackages-tools 201902
+
 * Sun Aug 18 2019 Fabio Valentini <decathorpe@gmail.com> - 1.11.2-1
 - Update to version 1.11.2.
 
@@ -80,9 +95,18 @@ This package contains the API documentation for %{name}.
 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
 
+* Mon Jul 22 2019 Marian Koncek <mkoncek@redhat.com> - 1.11.2-1
+- Update to upstream version 1.11.2
+
+* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.11.0-2
+- Mass rebuild for javapackages-tools 201901
+
 * Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 
+* Mon Nov 05 2018 Marian Koncek <mkoncek@redhat.com> - 1.11.0-1
+- Update to upstream version 1.11.0
+
 * Fri Jul 13 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.10.4-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild