diff --git a/felix-utils.spec b/felix-utils.spec
index d2e90d4..60f690d 100644
--- a/felix-utils.spec
+++ b/felix-utils.spec
@@ -1,26 +1,34 @@
+# Workaround for rhbz#1969370: __bootstrap macro is not defined in
+# CentOS Stream, See https://bugzilla.redhat.com/1969370
+%global __bootstrap ~bootstrap
+
+%bcond_without bootstrap
+
%global bundle org.apache.felix.utils
Name: felix-utils
Version: 1.11.6
-Release: 2%{?dist}
+Release: 3%{?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 +43,8 @@ This package contains the API documentation for %{name}.
%setup -q -n %{bundle}-%{version}
%patch0 -p1
+%pom_remove_parent
+%pom_xpath_inject pom:project "org.apache.felix"
%pom_remove_plugin :apache-rat-plugin
%mvn_file :%{bundle} "felix/%{bundle}"
@@ -53,8 +63,12 @@ This package contains the API documentation for %{name}.
%license LICENSE NOTICE
%changelog
-* Thu Apr 15 2021 Mohan Boddu - 1.11.6-2
-- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+* Tue Jun 08 2021 Mikolaj Izdebski - 1.11.6-3
+- Bootstrap Maven for CentOS Stream 9
+
+* Mon May 17 2021 Mikolaj Izdebski - 1.11.6-2
+- Bootstrap build
+- Non-bootstrap build
* Tue Feb 02 2021 Fabio Valentini - 1.11.6-1
- Update to version 1.11.6.
@@ -62,6 +76,9 @@ This package contains the API documentation for %{name}.
* Tue Jan 26 2021 Fedora Release Engineering - 1.11.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+* Wed Jan 20 2021 Marian Koncek - 1.11.6-1
+- Update to upstream version 1.11.6
+
* Mon Jul 27 2020 Fedora Release Engineering - 1.11.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
@@ -71,9 +88,15 @@ This package contains the API documentation for %{name}.
* Mon Mar 02 2020 Fabio Valentini - 1.11.4-1
- Update to version 1.11.4.
+* Wed Jan 29 2020 Marian Koncek - 1.11.4-1
+- Update to upstream version 1.11.4
+
* Tue Jan 28 2020 Fedora Release Engineering - 1.11.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+* Tue Nov 05 2019 Mikolaj Izdebski - 1.11.2-2
+- Mass rebuild for javapackages-tools 201902
+
* Sun Aug 18 2019 Fabio Valentini - 1.11.2-1
- Update to version 1.11.2.
@@ -83,9 +106,18 @@ This package contains the API documentation for %{name}.
* Thu Jul 25 2019 Fedora Release Engineering - 1.10.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+* Mon Jul 22 2019 Marian Koncek - 1.11.2-1
+- Update to upstream version 1.11.2
+
+* Fri May 24 2019 Mikolaj Izdebski - 1.11.0-2
+- Mass rebuild for javapackages-tools 201901
+
* Thu Jan 31 2019 Fedora Release Engineering - 1.10.4-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+* Mon Nov 05 2018 Marian Koncek - 1.11.0-1
+- Update to upstream version 1.11.0
+
* Fri Jul 13 2018 Fedora Release Engineering - 1.10.4-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild