From 9fa15122c3fe461b9640a3014021bae4cbdd148ba7f5ef1fda61f1e8f3b6bc5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 25 Feb 2025 19:32:05 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main oro revision e4f3ee4aab9d65468257a466d95f36b9 --- oro.changes | 5 +++++ oro.spec | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/oro.changes b/oro.changes index 4f36a0a..6187aa9 100644 --- a/oro.changes +++ b/oro.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 2 15:56:16 UTC 2024 - Fridrich Strba + +- Spec file cleanup + ------------------------------------------------------------------- Sat Mar 19 12:44:52 UTC 2022 - Fridrich Strba diff --git a/oro.spec b/oro.spec index ac638d3..2cdc17b 100644 --- a/oro.spec +++ b/oro.spec @@ -1,7 +1,7 @@ # # spec file for package oro # -# 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 @@ -32,7 +32,6 @@ BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: xml-commons-apis Provides: %{full_name} = %{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch %description @@ -64,7 +63,7 @@ for file in `find . -type f -name .cvsignore`; do rm -rf $file; done perl -pi -e 's#\@version\@#VERSION#g' $(grep -rl \@version\@ . |xargs) %build -%ant \ +%{ant} \ -Dant.build.javac.source=1.8 -Dant.build.javac.target=1.8 \ -Dfinal.name=%{name} jar javadocs @@ -75,7 +74,7 @@ install -pm 0644 %{name}.jar %{buildroot}%{_javadir}/ ln -sf %{name}.jar %{buildroot}%{_javadir}/%{full_name}.jar # pom install -dm 0755 %{buildroot}%{_mavenpomdir} -install -pm 0644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom +%{mvn_install_pom} %{SOURCE1} %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name}