From 35caefb8998f82be1521c4ab016ac7d978ef6e8a217ff7bcb47912288afe5143 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Apr 2019 17:55:59 +0000 Subject: [PATCH 1/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=45 --- apache-ivy.spec | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index da611f8..5e34759 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -51,8 +51,7 @@ reporting and publication. %package javadoc Summary: API Documentation for ivy -Group: Development/Tools/Building -Requires: %{name} = %{version}-%{release} +Group: Documentation/HTML %description javadoc JavaDoc documentation for %{name} @@ -62,6 +61,10 @@ JavaDoc documentation for %{name} %patch0 -p1 %patch1 -p1 +cp %{SOURCE2} pom.xml + +%pom_remove_parent . + #TODO: return back when bouncycastle-pgp will be available rm -fr src/java/org/apache/ivy/plugins/signer/bouncycastle @@ -94,7 +97,7 @@ install -p -m644 build/artifact/jars/ivy.jar %{buildroot}%{_javadir}/ivy.jar ln -sf ../ivy.jar %{buildroot}%{_javadir}/%{name}/ivy.jar install -d -m 0755 %{buildroot}/%{_mavenpomdir}/ -install -m 0644 %{SOURCE2} %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom +install -m 0644 pom.xml %{buildroot}/%{_mavenpomdir}/JPP-ivy.pom # Maven depmap %add_maven_depmap JPP-ivy.pom ivy.jar From d43f63ac009e4355ff45bd9d6ca8f844b783d8a74c3e4147222b889e4e64b523 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Apr 2019 17:57:12 +0000 Subject: [PATCH 2/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=46 --- apache-ivy.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/apache-ivy.spec b/apache-ivy.spec index 5e34759..3529e7b 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -34,7 +34,6 @@ BuildRequires: commons-httpclient BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local -BuildRequires: javapackages-tools BuildRequires: jsch BuildRequires: oro Provides: ivy = %{version}-%{release} From b22f20dda3320e938e19eebab29ca01d5531a89535bd7eac21f78be9bb51eaf2 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Apr 2019 18:12:40 +0000 Subject: [PATCH 3/3] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-ivy?expand=0&rev=47 --- apache-ivy.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/apache-ivy.changes b/apache-ivy.changes index 9a927d3..5c1b034 100644 --- a/apache-ivy.changes +++ b/apache-ivy.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 8 18:12:07 UTC 2019 - Fridrich Strba + +- Remove the reference to parent from pom file, since we are not + building using maven. + ------------------------------------------------------------------- Thu Feb 7 14:48:24 UTC 2019 - Fridrich Strba