Accepting request 1148904 from Java:packages

cleanup

OBS-URL: https://build.opensuse.org/request/show/1148904
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/glassfish-jaxb-api?expand=0&rev=6
This commit is contained in:
Ana Guerrero 2024-02-23 15:40:31 +00:00 committed by Git OBS Bridge
commit afa9b930bc
2 changed files with 8 additions and 16 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Feb 21 22:02:16 UTC 2024 - Fridrich Strba <fstrba@suse.com>
- Clean the spec file and simplify it a bit
-------------------------------------------------------------------
Sun Apr 10 19:13:12 UTC 2022 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
#
# spec file for package glassfish-jaxb-api
#
# Copyright (c) 2022 SUSE LLC
# Copyright (c) 2024 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -31,9 +31,8 @@ BuildRequires: ant
BuildRequires: fdupes
BuildRequires: glassfish-activation-api
BuildRequires: java-devel >= 9
BuildRequires: javapackages-local
BuildRequires: javapackages-local >= 6
BuildRequires: unzip
Requires: mvn(javax.activation:javax.activation-api)
BuildArch: noarch
%description
@ -62,18 +61,6 @@ cp %{SOURCE1} jaxb-api/build.xml
%pom_remove_plugin :cobertura-maven-plugin jaxb-api
%pom_remove_plugin :maven-dependency-plugin jaxb-api
%pom_remove_parent jaxb-api
%pom_xpath_inject pom:project "
<groupId>javax.xml.bind</groupId>
<version>%{version}</version>" jaxb-api
%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" "
<sourceFileExcludes>
<exclude>module-info.java</exclude>
</sourceFileExcludes>" jaxb-api
%pom_change_dep ::::: ::::: jaxb-api
%build
pushd jaxb-api
mkdir -p lib
@ -88,7 +75,7 @@ install -m 644 %{bundle}/target/%{bundle}-%{version}.jar %{buildroot}%{_javadir}
# pom
install -d -m 755 %{buildroot}%{_mavenpomdir}
install -pm 644 %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%{mvn_install_pom} %{bundle}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom %{name}.jar
# javadoc