rpms/osgi-compendium
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Merge modular branch

Browse Source
This commit is contained in:
Mikolaj Izdebski 2021-05-14 09:15:01 +02:00
commit 66e937982d
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
osgi-compendium.spec
View File

@ -1,5 +1,4 @@
# Optionally build with a reduced dependency set %bcond_with bootstrap
%bcond_with jp_minimal
Name: osgi-compendium Name: osgi-compendium
Version: 7.0.0 Version: 7.0.0
@ -12,14 +11,13 @@ BuildArch: noarch
Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar Source0: https://osgi.org/download/r7/osgi.cmpn-%{version}.jar
BuildRequires: maven-local BuildRequires: maven-local
BuildRequires: mvn(javax.servlet:javax.servlet-api) %if %{with bootstrap}
%if %{without jp_minimal} BuildRequires: javapackages-bootstrap
BuildRequires: mvn(javax.persistence:persistence-api) %else
BuildRequires: mvn(javax.ws.rs:javax.ws.rs-api) >= 2.1.5-2
%endif
BuildRequires: mvn(org.apache.felix:maven-bundle-plugin) BuildRequires: mvn(org.apache.felix:maven-bundle-plugin)
BuildRequires: mvn(org.osgi:osgi.annotation) BuildRequires: mvn(org.osgi:osgi.annotation)
BuildRequires: mvn(org.osgi:osgi.core) BuildRequires: mvn(org.osgi:osgi.core)
%endif
%description %description
OSGi Compendium, Interfaces and Classes for use in compiling bundles. OSGi Compendium, Interfaces and Classes for use in compiling bundles.
@ -69,16 +67,11 @@ mv META-INF/maven/org.osgi/osgi.cmpn/pom.xml .
%pom_add_dep org.osgi:osgi.annotation::provided %pom_add_dep org.osgi:osgi.annotation::provided
%pom_add_dep org.osgi:osgi.core::provided %pom_add_dep org.osgi:osgi.core::provided
%pom_add_dep javax.servlet:javax.servlet-api::provided # Don't compile in Servlet, Jax RS and JPA support
%if %{without jp_minimal} rm -r src/main/java/org/osgi/service/http
%pom_add_dep javax.persistence:persistence-api::provided
%pom_add_dep javax.ws.rs:javax.ws.rs-api::provided
%else
# 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/jaxrs
rm -r src/main/java/org/osgi/service/jpa rm -r src/main/java/org/osgi/service/jpa
rm -r src/main/java/org/osgi/service/transaction/control/jpa rm -r src/main/java/org/osgi/service/transaction/control/jpa
%endif
%build %build
%mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8 %mvn_build -- -Dmaven.compiler.source=1.8 -Dmaven.compiler.target=1.8
@ -111,9 +104,15 @@ rm -r src/main/java/org/osgi/service/transaction/control/jpa
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4 * Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild - 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 * Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 7.0.0-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild - 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
* Tue Mar 19 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-2 * Tue Mar 19 2019 Mat Booth <mat.booth@redhat.com> - 7.0.0-2
- Allow conditionally compiling in support for Jax RS and JPA - Allow conditionally compiling in support for Jax RS and JPA