Fridrich Strba 2019-02-26 09:24:20 +00:00 committed by Git OBS Bridge
parent 6c8141a807
commit 0a49cd45f6
2 changed files with 9 additions and 11 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Feb 26 09:24:00 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Clean up the maven pom installation
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba <fstrba@suse.com> Mon Oct 22 10:44:00 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package slf4j # 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 # Copyright (c) 2000-2009, JPackage Project
# #
# All modifications and additions to the file contributed by third parties # 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 # pom
install -d -m 755 %{buildroot}%{_mavenpomdir} 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 for i in api ext jcl jdk14 log4j12 migrator nop simple; do
install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom install -pm 644 slf4j-$i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom
%add_maven_depmap %{name}-$i.pom %{name}/$i.jar %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 install -pm 644 $i/pom.xml %{buildroot}%{_mavenpomdir}/%{name}-$i.pom
%add_maven_depmap %{name}-$i.pom %{name}/$i.jar %add_maven_depmap %{name}-$i.pom %{name}/$i.jar
done done
install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom
%add_maven_depmap %{name}.pom
# manual # manual
install -d -m 0755 %{buildroot}%{_docdir}/%{name}-%{version} 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}/ cp -pr target/site/* %{buildroot}%{_javadocdir}/%{name}/
rm -rf target/site rm -rf target/site
%files %files -f .mfiles
%dir %{_docdir}/%{name}-%{version} %dir %{_docdir}/%{name}-%{version}
%license %{_docdir}/%{name}-%{version}/LICENSE.txt %license %{_docdir}/%{name}-%{version}/LICENSE.txt
%{_javadir}/%{name}
%{_mavenpomdir}/*
%if %{defined _maven_repository}
%{_mavendepmapfragdir}/%{name}
%else
%{_datadir}/maven-metadata/%{name}.xml*
%endif
%files javadoc %files javadoc
%{_javadocdir}/%{name} %{_javadocdir}/%{name}