From 12e592150a566b67eb7a17a85108aca467f5731b851235cfec1063c18cebb03c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:39:57 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp?expand=0&rev=23 --- apache-commons-dbcp.changes | 6 ++++++ apache-commons-dbcp.spec | 6 +++--- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/apache-commons-dbcp.changes b/apache-commons-dbcp.changes index 5be457d..3678a0d 100644 --- a/apache-commons-dbcp.changes +++ b/apache-commons-dbcp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:39:46 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + ------------------------------------------------------------------- Sat Dec 15 14:17:20 UTC 2018 - Fridrich Strba diff --git a/apache-commons-dbcp.spec b/apache-commons-dbcp.spec index ea48ad5..e833a85 100644 --- a/apache-commons-dbcp.spec +++ b/apache-commons-dbcp.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-dbcp # -# 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 @@ -32,7 +32,6 @@ Patch0: apache-commons-dbcp-sourcetarget.patch Patch1: apache-commons-dbcp-javadoc.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-commons-logging -BuildRequires: apache-commons-parent BuildRequires: apache-commons-pool2 BuildRequires: fdupes BuildRequires: geronimo-jta-1_1-api @@ -41,7 +40,6 @@ BuildRequires: javapackages-local BuildRequires: jdbc-stdext >= 2.0 BuildRequires: junit >= 3.8.1 BuildRequires: xerces-j2 -Requires: apache-commons-parent Requires: commons-collections >= 3.2 Requires: commons-pool2 Requires: jta_api >= 1.1 @@ -85,6 +83,8 @@ features. # remove all binary libs find . -name "*.jar" -exec rm -f {} \; +%pom_remove_parent . + %build ant \ -Dcommons-pool.jar=$(build-classpath commons-pool2) \