From 0a49cd45f6c92a5001475b487bd097a083e700cdabeb76cfe5357ccfe2b4b67c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Tue, 26 Feb 2019 09:24:20 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/slf4j?expand=0&rev=37 --- slf4j.changes | 5 +++++ slf4j.spec | 15 ++++----------- 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/slf4j.changes b/slf4j.changes index 4f7b8da..9e5775b 100644 --- a/slf4j.changes +++ b/slf4j.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Feb 26 09:24:00 UTC 2019 - Fridrich Strba + +- Clean up the maven pom installation + ------------------------------------------------------------------- Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba diff --git a/slf4j.spec b/slf4j.spec index 1206576..c255335 100644 --- a/slf4j.spec +++ b/slf4j.spec @@ -1,7 +1,7 @@ # # spec file for package slf4j # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2000-2009, JPackage Project # # All modifications and additions to the file contributed by third parties @@ -137,6 +137,8 @@ install -m 644 slf4j-simple/target/%{name}-simple-%{version}.jar \ # pom install -d -m 755 %{buildroot}%{_mavenpomdir} +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom +%add_maven_depmap %{name}.pom for i in api ext jcl jdk14 log4j12 migrator nop simple; do install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom %add_maven_depmap %{name}-$i.pom %{name}/$i.jar @@ -145,8 +147,6 @@ for i in jcl-over-slf4j jul-to-slf4j log4j-over-slf4j; do install -pm 644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom %add_maven_depmap %{name}-$i.pom %{name}/$i.jar done -install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom -%add_maven_depmap %{name}.pom # manual install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} @@ -159,16 +159,9 @@ install -d -m 0755 %{buildroot}%{_javadocdir}/%{name} cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/ rm -rf target/site -%files +%files -f .mfiles %dir %{_docdir}/%{name}-%{version} %license %{_docdir}/%{name}-%{version}/LICENSE.txt -%{_javadir}/%{name} -%{_mavenpomdir}/* -%if %{defined _maven_repository} -%{_mavendepmapfragdir}/%{name} -%else -%{_datadir}/maven-metadata/%{name}.xml* -%endif %files javadoc %{_javadocdir}/%{name}