Fridrich Strba 2019-03-25 17:38:07 +00:00 committed by Git OBS Bridge
parent 5483df5e7f
commit cab33b6b8c
2 changed files with 10 additions and 4 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 17:37:52 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove pom parent, since we don't use it when not building with
maven
-------------------------------------------------------------------
Sat Dec 15 14:06:03 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -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) \