diff --git a/apache-commons-pool.changes b/apache-commons-pool.changes index 33e6e4d..66f5716 100644 --- a/apache-commons-pool.changes +++ b/apache-commons-pool.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Mar 25 17:51:29 UTC 2019 - Fridrich Strba + +- Remove pom parent, since we don't use it when not building with + maven + ------------------------------------------------------------------- Thu Dec 13 10:37:54 UTC 2018 - Fridrich Strba diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index 2357779..096b310 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -1,7 +1,7 @@ # # spec file for package apache-commons-pool # -# 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 @@ -29,12 +29,11 @@ Source0: http://www.apache.org/dist/commons/%{base_name}/source/%{short_n Patch0: jakarta-commons-pool-build.patch Patch1: commons-pool-1.6-sourcetarget.patch BuildRequires: ant -BuildRequires: apache-commons-parent +BuildRequires: dos2unix BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local BuildRequires: junit -Requires: apache-commons-parent Provides: jakarta-%{short_name} = %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version}-%{release} Provides: %{short_name} = %{version}-%{release} @@ -68,6 +67,10 @@ find . -name "*.jar" -exec rm -f {} \; %patch0 %patch1 -p1 +dos2unix README.txt + +%pom_remove_parent . + %build ant -Djava.io.tmpdir=. clean dist