From cab33b6b8c7143727eca0dc7717055f5e2e95a7b70d314a11a7f4b3ac6765481 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:38:07 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-dbcp1?expand=0&rev=7 --- apache-commons-dbcp1.changes | 6 ++++++ apache-commons-dbcp1.spec | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/apache-commons-dbcp1.changes b/apache-commons-dbcp1.changes index 3b92dd4..f2b2b80 100644 --- a/apache-commons-dbcp1.changes +++ b/apache-commons-dbcp1.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:37:52 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + ------------------------------------------------------------------- Sat Dec 15 14:06:03 UTC 2018 - Fridrich Strba diff --git a/apache-commons-dbcp1.spec b/apache-commons-dbcp1.spec index ad65008..43f5e7a 100644 --- a/apache-commons-dbcp1.spec +++ b/apache-commons-dbcp1.spec @@ -1,7 +1,7 @@ # -# spec file for package apache-commons-dbcp +# spec file for package apache-commons-dbcp1 # -# 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 @@ -33,7 +33,6 @@ Patch1: apache-commons-dbcp-javadoc.patch Patch2: apache-commons-dbcp-jdbc41.patch BuildRequires: ant >= 1.6.5 BuildRequires: apache-commons-logging -BuildRequires: apache-commons-parent BuildRequires: apache-commons-pool BuildRequires: fdupes BuildRequires: geronimo-jta-1_1-api @@ -42,7 +41,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-pool Requires: jta_api >= 1.1 @@ -86,6 +84,8 @@ features. # remove all binary libs find . -name "*.jar" -exec rm -f {} \; +%pom_remove_parent . + %build ant \ -Dcommons-pool.jar=$(build-classpath commons-pool) \