From 123c57a62a2bb5796c9236802253b81e816bf6e61eb9db40b6488c7f70d3606b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Fri, 8 Feb 2019 15:37:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/jdom2?expand=0&rev=2 --- jdom2.spec | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/jdom2.spec b/jdom2.spec index 1448366..bc9713f 100644 --- a/jdom2.spec +++ b/jdom2.spec @@ -1,7 +1,7 @@ # # spec file for package jdom2 # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -84,17 +84,29 @@ build-jar-repository lib xerces-j2 xml-commons-apis jaxen junit isorelax xalan-j ant -Dversion=%{version} -Dcompile.target=6 -Dcompile.source=6 -Dj2se.apidoc=%{_javadocdir}/java maven %install -%mvn_artifact build/maven/core/%{name}-%{version}.pom build/package/jdom-%{version}.jar -%mvn_artifact build/maven/core/%{name}-%{version}-contrib.pom build/package/jdom-%{version}-contrib.jar -%mvn_artifact build/maven/core/%{name}-%{version}-junit.pom build/package/jdom-%{version}-junit.jar -%mvn_install -J build/apidocs +# jar +install -dm 0755 %{buildroot}%{_javadir}/%{name} +install -pm 0644 build/package/jdom-%{version}.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar +install -pm 0644 build/package/jdom-%{version}-contrib.jar %{buildroot}%{_javadir}/%{name}/%{name}-contrib.jar +install -pm 0644 build/package/jdom-%{version}-junit.jar %{buildroot}%{_javadir}/%{name}/%{name}-junit.jar +# pom +install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} +install -pm 0644 build/maven/core/%{name}-%{version}.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom +%add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar +install -pm 0644 build/maven/core/%{name}-%{version}-contrib.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-contrib.pom +%add_maven_depmap %{name}/%{name}-contrib.pom %{name}/%{name}-contrib.jar +install -pm 0644 build/maven/core/%{name}-%{version}-junit.pom %{buildroot}%{_mavenpomdir}/%{name}/%{name}-junit.pom +%add_maven_depmap %{name}/%{name}-junit.pom %{name}/%{name}-junit.jar +# javadoc +install -dm 0755 %{buildroot}%{_javadocdir}/%{name} +cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}/ %fdupes %{buildroot}%{_javadocdir} %files -f .mfiles %doc CHANGES.txt COMMITTERS.txt README.txt TODO.txt %license LICENSE.txt -%files javadoc -f .mfiles-javadoc -%license LICENSE.txt +%files javadoc +%{_javadocdir}/%{name} %changelog