Accepting request 689053 from Java:packages

Disregard the pom parent

OBS-URL: https://build.opensuse.org/request/show/689053
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/apache-commons-pool?expand=0&rev=5
This commit is contained in:
Dominique Leuenberger 2019-03-27 15:22:35 +00:00 committed by Git OBS Bridge
commit e970120894
2 changed files with 12 additions and 3 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 25 17:51:29 UTC 2019 - Fridrich Strba <fstrba@suse.com>
- Remove pom parent, since we don't use it when not building with
maven
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Dec 13 10:37:54 UTC 2018 - Fridrich Strba <fstrba@suse.com> Thu Dec 13 10:37:54 UTC 2018 - Fridrich Strba <fstrba@suse.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package apache-commons-pool # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # 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 Patch0: jakarta-commons-pool-build.patch
Patch1: commons-pool-1.6-sourcetarget.patch Patch1: commons-pool-1.6-sourcetarget.patch
BuildRequires: ant BuildRequires: ant
BuildRequires: apache-commons-parent BuildRequires: dos2unix
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: java-devel >= 1.8 BuildRequires: java-devel >= 1.8
BuildRequires: javapackages-local BuildRequires: javapackages-local
BuildRequires: junit BuildRequires: junit
Requires: apache-commons-parent
Provides: jakarta-%{short_name} = %{version}-%{release} Provides: jakarta-%{short_name} = %{version}-%{release}
Obsoletes: jakarta-%{short_name} < %{version}-%{release} Obsoletes: jakarta-%{short_name} < %{version}-%{release}
Provides: %{short_name} = %{version}-%{release} Provides: %{short_name} = %{version}-%{release}
@ -68,6 +67,10 @@ find . -name "*.jar" -exec rm -f {} \;
%patch0 %patch0
%patch1 -p1 %patch1 -p1
dos2unix README.txt
%pom_remove_parent .
%build %build
ant -Djava.io.tmpdir=. clean dist ant -Djava.io.tmpdir=. clean dist