From 30a5a17177bf66f14ef3773d86a5dd4b983023125d0e43ff5b23a7da004090cd Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 23 May 2024 05:54:58 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/junit?expand=0&rev=64 --- junit.changes | 5 +++++ junit.spec | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/junit.changes b/junit.changes index c71ccf4..7cdd123 100644 --- a/junit.changes +++ b/junit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 23 05:53:55 UTC 2024 - Fridrich Strba + +- Require hamcrest >= 2.2 to resolve choice of providers + ------------------------------------------------------------------- Sat Apr 27 11:44:02 UTC 2024 - Fridrich Strba diff --git a/junit.spec b/junit.spec index 011b884..eba15b2 100644 --- a/junit.spec +++ b/junit.spec @@ -29,9 +29,10 @@ Patch0: 0001-Port-to-hamcrest-2.2.patch Patch1: 0002-remove-usages-of-deprecated-org.junit.Assert.assertT.patch BuildRequires: ant BuildRequires: fdupes -BuildRequires: hamcrest >= 2.0 +BuildRequires: hamcrest >= 2.2 BuildRequires: java-devel >= 1.8 BuildRequires: javapackages-local >= 6 +Requires: hamcrest >= 2.2 Provides: %{name}-demo = %{version}-%{release} Obsoletes: %{name}-demo < %{version}-%{release} Provides: %{name}4-demo = %{version}-%{release}