From e2ef5e6ae82823461cc92c097e6602e7bd15cfd1 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Thu, 26 Dec 2024 03:25:57 +0300 Subject: [PATCH] import guava-30.1-8.el9_5 --- SPECS/guava.spec | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/SPECS/guava.spec b/SPECS/guava.spec index 642d6dc..f621fb1 100644 --- a/SPECS/guava.spec +++ b/SPECS/guava.spec @@ -2,7 +2,7 @@ Name: guava Version: 30.1 -Release: 6%{?dist} +Release: 8%{?dist} Summary: Google Core Libraries for Java # Most of the code is under ASL 2.0 # Few classes are under CC0, grep for creativecommons @@ -91,7 +91,7 @@ annotations=$( find -name '*.java' | xargs sed -ri \ "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g' -%patch1 -p1 +%patch -P 1 -p1 %mvn_package "com.google.guava:failureaccess" guava @@ -112,7 +112,13 @@ find -name '*.java' | xargs sed -ri \ %files testlib -f .mfiles-guava-testlib %changelog -* Wed Mar 15 2023 MSVSphere Packaging Team - 30.1-5 +* Thu Nov 21 2024 Marián Konček - 30.1-8 +- Fix patch usage + +* Wed Nov 20 2024 Marián Konček - 30.1-7 +- Rebuild with regenerated Requires on Java + +* Wed Mar 15 2023 MSVSphere Packaging Team - 30.1-6 - Rebuilt for MSVSphere 9.1. * Mon Jan 30 2023 Mikolaj Izdebski - 30.1-6