From 8852b2b87be3abac2b0e3d052444f403036aa42f77556436de9c9f92feafe76c Mon Sep 17 00:00:00 2001 From: Fridrich Strba Date: Thu, 23 May 2024 14:21:04 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/Java:packages/eclipse-jgit?expand=0&rev=68 --- eclipse-jgit.changes | 5 +++++ eclipse-jgit.spec | 4 ++-- jgit.changes | 5 +++++ 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/eclipse-jgit.changes b/eclipse-jgit.changes index e13a45b..d3163c8 100644 --- a/eclipse-jgit.changes +++ b/eclipse-jgit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 23 14:19:57 UTC 2024 - Fridrich Strba + +- Require hamcrest to avoid conflict of providers with hamcrest-core + ------------------------------------------------------------------- Wed Feb 21 21:55:25 UTC 2024 - Fridrich Strba diff --git a/eclipse-jgit.spec b/eclipse-jgit.spec index a945ded..dd5620d 100644 --- a/eclipse-jgit.spec +++ b/eclipse-jgit.spec @@ -50,7 +50,7 @@ BuildRequires: ed25519-java BuildRequires: fdupes BuildRequires: git BuildRequires: google-gson -BuildRequires: hamcrest-core +BuildRequires: hamcrest BuildRequires: javaewah BuildRequires: jgit = %{version} BuildRequires: junit @@ -74,7 +74,7 @@ Requires: bouncycastle-pg Requires: bouncycastle-pkix Requires: ed25519-java Requires: google-gson -Requires: hamcrest-core +Requires: hamcrest Requires: javaewah Requires: jgit = %{version} Requires: junit diff --git a/jgit.changes b/jgit.changes index e13a45b..d3163c8 100644 --- a/jgit.changes +++ b/jgit.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Thu May 23 14:19:57 UTC 2024 - Fridrich Strba + +- Require hamcrest to avoid conflict of providers with hamcrest-core + ------------------------------------------------------------------- Wed Feb 21 21:55:25 UTC 2024 - Fridrich Strba