From 438a6a96e998ea038f7b1c08296a823aa6acafc6d666a1cf716748849b6564f8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 31 May 2024 14:35:41 +0200 Subject: [PATCH] Sync from SUSE:SLFO:Main glassfish-jaxb-api revision cfb135b5d608ba4d3374e0b8c0c989a5 --- glassfish-jaxb-api-build.xml | 25 +++++++++++++++---------- glassfish-jaxb-api.changes | 10 ++++++++++ glassfish-jaxb-api.spec | 23 +++++++---------------- 3 files changed, 32 insertions(+), 26 deletions(-) diff --git a/glassfish-jaxb-api-build.xml b/glassfish-jaxb-api-build.xml index c6147cf..56b23ec 100644 --- a/glassfish-jaxb-api-build.xml +++ b/glassfish-jaxb-api-build.xml @@ -10,7 +10,8 @@ - + + @@ -52,6 +53,7 @@ debug="true" optimize="false" deprecation="true" + release="${compiler.release}" target="${compiler.target}" verbose="false" fork="false" @@ -65,14 +67,16 @@ + nowarn="false" + debug="true" + encoding="utf-8" + optimize="false" + deprecation="true" + release="9" + target="9" + verbose="false" + fork="false" + source="9"> @@ -82,12 +86,13 @@ - + +- The binaries are compatible with java 1.8 + +------------------------------------------------------------------- +Wed Feb 21 22:02:16 UTC 2024 - Fridrich Strba + +- Clean the spec file and simplify it a bit + ------------------------------------------------------------------- Sun Apr 10 19:13:12 UTC 2022 - Fridrich Strba diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec index 17273dd..5a49a9f 100644 --- a/glassfish-jaxb-api.spec +++ b/glassfish-jaxb-api.spec @@ -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 @@ -18,6 +18,9 @@ %global oname jaxb-spec %global bundle jaxb-api +# The automatic requires would be java-headless >= 9, but the +# binaries are java 8 compatible +%define __requires_exclude java-headless Name: glassfish-jaxb-api Version: 2.4.0 Release: 0 @@ -31,9 +34,9 @@ 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) +Requires: java-headless >= 1.8 BuildArch: noarch %description @@ -62,18 +65,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 " - javax.xml.bind - %{version}" jaxb-api - -%pom_xpath_inject "pom:plugin[pom:artifactId = 'maven-javadoc-plugin']/pom:configuration" " - - module-info.java - " jaxb-api - -%pom_change_dep ::::: ::::: jaxb-api - %build pushd jaxb-api mkdir -p lib @@ -88,7 +79,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