diff --git a/apache-commons-pool2.changes b/apache-commons-pool2.changes index 86a9748..bee0a34 100644 --- a/apache-commons-pool2.changes +++ b/apache-commons-pool2.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:47:40 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + ------------------------------------------------------------------- Thu Dec 13 11:27:43 UTC 2018 - Fridrich Strba diff --git a/apache-commons-pool2.spec b/apache-commons-pool2.spec index 0f4b27b..ff6fd3d 100644 --- a/apache-commons-pool2.spec +++ b/apache-commons-pool2.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-pool2 # -# 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 @@ -28,7 +28,6 @@ URL: https://commons.apache.org/proper/commons-pool/ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_name}-%{version}-src.tar.gz Patch0: jakarta-commons-pool-build.patch BuildRequires: ant -BuildRequires: apache-commons-parent BuildRequires: cglib BuildRequires: fdupes BuildRequires: java-devel >= 1.8 @@ -65,6 +64,9 @@ Pool 2.x Package. find . -name "*.jar" -exec rm -f {} \; %patch0 +%pom_remove_parent . +%pom_xpath_inject "pom:project" "org.apache.commons" . + %build echo "cglib.jar=$(build-classpath cglib)" >> build.properties ant \