Fridrich Strba 2021-05-11 15:02:09 +00:00 committed by Git OBS Bridge
parent 0393d4b3a7
commit 001abdf87a
2 changed files with 8 additions and 3 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue May 11 15:01:31 UTC 2021 - Fridrich Strba <fstrba@suse.com>
- Do not compile/run tests against the legacy guava20 package
-------------------------------------------------------------------
Sun Mar 3 18:20:04 UTC 2019 - Jan Engelhardt <jengelh@inai.de>

View File

@ -1,7 +1,7 @@
#
# spec file for package plexus-cli
#
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
# Copyright (c) 2021 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@ -43,7 +43,7 @@ Requires: mvn(org.codehaus.plexus:plexus-utils)
BuildArch: noarch
%if %{with tests}
BuildRequires: ant-junit
BuildRequires: guava20
BuildRequires: guava
%endif
%description
@ -70,7 +70,7 @@ cp -p %{SOURCE100} build.xml
mkdir -p lib
build-jar-repository -s lib commons-cli plexus/utils plexus/classworlds plexus-containers/plexus-container-default
%if %{with tests}
build-jar-repository -s lib guava20/guava-20.0
build-jar-repository -s lib guava/guava
%endif
%build