diff --git a/SPECS/guava.spec b/SPECS/guava.spec index 24c9a05..6de0485 100644 --- a/SPECS/guava.spec +++ b/SPECS/guava.spec @@ -2,13 +2,14 @@ Name: guava Version: 30.1 -Release: 6%{?dist} +Release: 10%{?dist} Summary: Google Core Libraries for Java # Most of the code is under ASL 2.0 # Few classes are under CC0, grep for creativecommons License: ASL 2.0 and CC0 URL: https://github.com/google/guava BuildArch: noarch +ExclusiveArch: aarch64 ppc64le s390x x86_64 noarch Source0: https://github.com/google/guava/archive/v%{version}.tar.gz @@ -91,7 +92,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,6 +113,18 @@ find -name '*.java' | xargs sed -ri \ %files testlib -f .mfiles-guava-testlib %changelog +* Sat Nov 23 2024 Marián Konček - 30.1-10 +- Add noarch to ExclusiveArch + +* Sat Nov 23 2024 Marián Konček - 30.1-9 +- Disable building on i686 + +* 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 + * Mon Jan 30 2023 Mikolaj Izdebski - 30.1-6 - Rebuild to regenerate auto-requires