From 01ce8526d40300692614611825df90c229cde0977586d63717e242882685911b Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 8 Apr 2019 11:37:31 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/xml-commons-apis?expand=0&rev=17 --- xml-commons-apis.changes | 6 ++++++ xml-commons-apis.spec | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/xml-commons-apis.changes b/xml-commons-apis.changes index 9450377..af4c022 100644 --- a/xml-commons-apis.changes +++ b/xml-commons-apis.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Apr 8 11:37:06 UTC 2019 - Fridrich Strba + +- Do not depend on the apache-parent, since we are not building + using Maven. + ------------------------------------------------------------------- Fri Feb 1 16:34:45 UTC 2019 - Fridrich Strba diff --git a/xml-commons-apis.spec b/xml-commons-apis.spec index d924c2c..47e1b7e 100644 --- a/xml-commons-apis.spec +++ b/xml-commons-apis.spec @@ -32,13 +32,11 @@ Source2: %{name}-ext-MANIFEST.MF Source3: http://repo1.maven.org/maven2/xml-apis/xml-apis/2.0.2/xml-apis-2.0.2.pom Source4: http://repo1.maven.org/maven2/xml-apis/xml-apis-ext/1.3.04/xml-apis-ext-1.3.04.pom BuildRequires: ant -BuildRequires: apache-parent BuildRequires: fdupes BuildRequires: java-devel BuildRequires: javapackages-local BuildRequires: xz #!BuildIgnore: xerces-j2 xml-apis xml-resolver -Requires: apache-parent Conflicts: xml-commons-apis-bootstrap Provides: xerces-j2-xml-apis Provides: xml-apis = %{version}-%{release} @@ -87,6 +85,8 @@ iconv -f iso8859-1 -t utf-8 LICENSE.dom-software.txt > \ cp %{SOURCE3} %{SOURCE4} . sed -i '/distributionManagement/,/\/distributionManagement/ {d}' *.pom +%pom_remove_parent xml-apis-ext*.pom + %build ant -Dant.build.javac.source=6 -Dant.build.javac.target=6 jar javadoc