SPECS/osgi-compendium.spec

@@ -1,8 +1,6 @@
-%bcond_with bootstrap
-
 Name:           osgi-compendium
 Version:        7.0.0
-Release:        12%{?dist}
+Release:        4%{?dist}
 Summary:        Interfaces and Classes for use in compiling OSGi bundles
 License:        ASL 2.0
 URL:            http://www.osgi.org
@@ -11,13 +9,10 @@ BuildArch:      noarch
 Source0:        https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
 
 BuildRequires:  maven-local
-%if %{with bootstrap}
-BuildRequires:  javapackages-bootstrap
-%else
+BuildRequires:  mvn(javax.servlet:javax.servlet-api)
 BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.osgi:osgi.annotation)
 BuildRequires:  mvn(org.osgi:osgi.core)
-%endif
 
 %description
 OSGi Compendium, Interfaces and Classes for use in compiling bundles.
@@ -67,8 +62,8 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
 
 %pom_add_dep org.osgi:osgi.annotation::provided
 %pom_add_dep org.osgi:osgi.core::provided
-# Don't compile in Servlet, Jax RS and JPA support
-rm -r src/main/java/org/osgi/service/http
+%pom_add_dep javax.servlet:javax.servlet-api::provided
+# Don't compile in Jax RS and JPA support when jp_minimal is activated
 rm -r src/main/java/org/osgi/service/jaxrs
 rm -r src/main/java/org/osgi/service/jpa
 rm -r src/main/java/org/osgi/service/transaction/control/jpa
@@ -89,41 +84,9 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa
 
 
 %changelog
-* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 7.0.0-12
-- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-  Related: rhbz#1991688
-
-* Wed Jun 09 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-11
-- Rebuild to workaround DistroBaker issue
-
-* Tue Jun 08 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-10
-- Bootstrap Maven for CentOS Stream 9
-
-* Mon May 17 2021 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-9
-- Bootstrap build
-- Non-bootstrap build
-
-* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-8
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
-
-* Wed Nov 25 2020 Mat Booth <mat.booth@redhat.com> - 7.0.0-7
-- Rebuild to regenerate OSGi metadata
-
-* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* Sat Jul 11 2020 Jiri Vanek <jvanek@redhat.com> - 7.0.0-5
-- Rebuilt for JDK-11, see https://fedoraproject.org/wiki/Changes/Java11
-
-* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
 * Tue Nov 05 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-4
 - Mass rebuild for javapackages-tools 201902
 
-* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 7.0.0-3
 - Mass rebuild for javapackages-tools 201901