From 8798b7d812fbb498877f1bc0a1e526818e98cbc4346faaee9a6f2925450cb570 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 29 Sep 2023 13:19:04 +0000 Subject: [PATCH 1/3] Accepting request 1114360 from Java:packages:test simplify OBS-URL: https://build.opensuse.org/request/show/1114360 OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb-api?expand=0&rev=20 --- glassfish-jaxb-api.spec | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec index 17273dd..e359595 100644 --- a/glassfish-jaxb-api.spec +++ b/glassfish-jaxb-api.spec @@ -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 " - 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 +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 From 4dd5b83c637e7399ae62af5ae829c40009f50da1f279c23f5ac99dcb304275bf Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 22:01:43 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb-api?expand=0&rev=21 --- glassfish-jaxb-api.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/glassfish-jaxb-api.spec b/glassfish-jaxb-api.spec index e359595..cb0a5ad 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 From 48cf8315529927de0a0988fd89393fcd6688035c84228249057f5ceecf5d494f Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Wed, 21 Feb 2024 22:02:21 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/glassfish-jaxb-api?expand=0&rev=22 --- glassfish-jaxb-api.changes | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/glassfish-jaxb-api.changes b/glassfish-jaxb-api.changes index 97b5318..9236db7 100644 --- a/glassfish-jaxb-api.changes +++ b/glassfish-jaxb-api.changes @@ -1,3 +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