From 4e87efe903bfe6d5ff6f5538a6001bef1f0ea3ac6ca19a71ff3a16cfe359cf11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Tue, 25 Feb 2025 19:18:17 +0100 Subject: [PATCH] Sync from SUSE:SLFO:Main avalon-logkit revision 443f8908aced44b916d2f81eacbe623b --- avalon-logkit.changes | 5 +++++ avalon-logkit.spec | 9 +++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/avalon-logkit.changes b/avalon-logkit.changes index 1c4fd49..bd292e4 100644 --- a/avalon-logkit.changes +++ b/avalon-logkit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Oct 2 15:36:31 UTC 2024 - Fridrich Strba + +- Spec file cleanup + ------------------------------------------------------------------- Tue Feb 20 10:46:39 UTC 2024 - Dominique Leuenberger diff --git a/avalon-logkit.spec b/avalon-logkit.spec index 2fb23b9..22d8940 100644 --- a/avalon-logkit.spec +++ b/avalon-logkit.spec @@ -1,7 +1,7 @@ # # spec file for package avalon-logkit # -# Copyright (c) 2023 SUSE LLC +# Copyright (c) 2024 SUSE LLC # Copyright (c) 2000-2005, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -92,7 +92,7 @@ install -m 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar #pom install -d -m 755 %{buildroot}/%{_mavenpomdir} -%mvn_install_pom pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom +%{mvn_install_pom} pom.xml %{buildroot}/%{_mavenpomdir}/JPP-%{name}.pom %add_maven_depmap JPP-%{name}.pom %{name}.jar -a "%{short_name}:%{short_name},org.apache.avalon.logkit:%{name}" # javadoc @@ -101,10 +101,11 @@ cp -pr dist/docs/api/* %{buildroot}%{_javadocdir}/%{name} %fdupes -s %{buildroot}%{_javadocdir}/%{name} %files -f .mfiles -%doc LICENSE.txt NOTICE.txt +%license LICENSE.txt +%doc NOTICE.txt %files javadoc -%doc LICENSE.txt +%license LICENSE.txt %{_javadocdir}/* %changelog