From 3686d1936ccb63e312bc30cce5e3bef91f3a73d6a8c9a70ca7080b65b241c8a1 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Apr 2019 11:33:34 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xml-commons-resolver?expand=0&rev=13 --- xml-commons-resolver.changes | 6 ++++++ xml-commons-resolver.spec | 8 +++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/xml-commons-resolver.changes b/xml-commons-resolver.changes index 92f5625..a6aaf1d 100644 --- a/xml-commons-resolver.changes +++ b/xml-commons-resolver.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 8 11:32:53 UTC 2019 - Fridrich Strba + +- Do not depend on the parent pom since we are not building using + Maven. + ------------------------------------------------------------------- Fri Feb 1 16:33:40 UTC 2019 - Fridrich Strba diff --git a/xml-commons-resolver.spec b/xml-commons-resolver.spec index 6ef0cdf..acd43e0 100644 --- a/xml-commons-resolver.spec +++ b/xml-commons-resolver.spec @@ -33,12 +33,10 @@ Source10: %{name}-CatalogManager.properties Patch0: %{name}-1.2-crosslink.patch Patch1: %{name}-1.2-osgi.patch BuildRequires: ant -BuildRequires: apache-parent BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local #!BuildIgnore: xerces-j2 xml-apis xml-resolver -Requires: apache-parent # Explicit javapackages-tools requires since scripts use # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -71,11 +69,15 @@ Javadoc for %{name}. %patch0 -p1 %patch1 -p1 +cp %{SOURCE5} pom.xml + # remove all binary libs and prebuilt javadocs find . -name "*.jar" -delete rm -rf docs sed -i 's/\r//' KEYS LICENSE.resolver.txt NOTICE-resolver.txt +%pom_remove_parent . + %build %{ant} -f resolver.xml -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadocs @@ -91,7 +93,7 @@ popd # pom install -d -m 0755 %{buildroot}%{_mavenpomdir} -install -pm 644 %{SOURCE5} %{buildroot}%{_mavenpomdir}/%{name}.pom +install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/%{name}.pom %add_maven_depmap %{name}.pom %{name}.jar # javadoc