From 98c618e065abebd25758feb38a0c9dd56144e7024e4d386fca95b3ec991c2821 Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:50:08 +0000 Subject: [PATCH 1/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=17 --- apache-commons-pool.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/apache-commons-pool.spec b/apache-commons-pool.spec index 2357779..df16ca9 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,10 @@ 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: 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 +66,8 @@ find . -name "*.jar" -exec rm -f {} \; %patch0 %patch1 -p1 +%pom_remove_parent . + %build ant -Djava.io.tmpdir=. clean dist From ca2019abcf98948b3dd83c0857724a2aea60eef7b74b5a2178eb126d91de135e Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Mon, 25 Mar 2019 17:52:02 +0000 Subject: [PATCH 2/2] OBS-URL: https://build.opensuse.org/package/show/Java:packages/apache-commons-pool?expand=0&rev=18 --- apache-commons-pool.changes | 6 ++++++ apache-commons-pool.spec | 3 +++ 2 files changed, 9 insertions(+) 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 df16ca9..096b310 100644 --- a/apache-commons-pool.spec +++ b/apache-commons-pool.spec @@ -29,6 +29,7 @@ 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: dos2unix BuildRequires: fdupes BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local @@ -66,6 +67,8 @@ find . -name "*.jar" -exec rm -f {} \; %patch0 %patch1 -p1 +dos2unix README.txt + %pom_remove_parent . %build