Update to upstream version 32.1.3

This commit is contained in:
Marian Koncek 2023-11-27 16:18:56 +01:00
parent 868b493b45
commit 477683bd88
3 changed files with 13 additions and 4 deletions

1
.gitignore vendored
View File

@ -15,3 +15,4 @@
/v30.1.tar.gz /v30.1.tar.gz
/guava-31.0.1.tar.gz /guava-31.0.1.tar.gz
/guava-31.1.tar.gz /guava-31.1.tar.gz
/guava-32.1.3.tar.gz

View File

@ -1,8 +1,8 @@
%bcond_with bootstrap %bcond_with bootstrap
Name: guava Name: guava
Version: 31.1 Version: 32.1.3
Release: 8%{?dist} Release: 1%{?dist}
Summary: Google Core Libraries for Java Summary: Google Core Libraries for Java
# Most of the code is under ASL 2.0 # Most of the code is under ASL 2.0
# Few classes are under CC0, grep for creativecommons # Few classes are under CC0, grep for creativecommons
@ -65,8 +65,13 @@ find . -name '*.jar' -delete
# javadoc generation fails due to strict doclint in JDK 1.8.0_45 # javadoc generation fails due to strict doclint in JDK 1.8.0_45
%pom_remove_plugin -r :maven-javadoc-plugin %pom_remove_plugin -r :maven-javadoc-plugin
%pom_remove_plugin -r :build-helper-maven-plugin
%pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>" guava/pom.xml %pom_xpath_inject /pom:project/pom:build/pom:plugins/pom:plugin/pom:configuration/pom:instructions "<_nouses>true</_nouses>" guava/pom.xml
# missing error_prone_core artifact
%pom_xpath_remove pom:annotationProcessorPaths
%pom_remove_dep -r :error_prone_annotations %pom_remove_dep -r :error_prone_annotations
%pom_remove_dep -r :j2objc-annotations %pom_remove_dep -r :j2objc-annotations
%pom_remove_dep -r org.checkerframework: %pom_remove_dep -r org.checkerframework:
@ -92,11 +97,14 @@ find . -name '*.jar' -delete
%files -f .mfiles-guava %files -f .mfiles-guava
%doc CONTRIBUTORS README* %doc CONTRIBUTORS README*
%license COPYING %license LICENSE
%files testlib -f .mfiles-guava-testlib %files testlib -f .mfiles-guava-testlib
%changelog %changelog
* Tue Nov 21 2023 Marian Koncek <mkoncek@redhat.com> - 32.1.3-1
- Update to upstream version 32.1.3
* Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 31.1-8 * Wed Sep 20 2023 Mikolaj Izdebski <mizdebsk@redhat.com> - 31.1-8
- Rebuild to regenerate auto-Requires on java - Rebuild to regenerate auto-Requires on java

View File

@ -1 +1 @@
SHA512 (guava-31.1.tar.gz) = 660b486d82d526ce722130f2968ea8ab9eb53f5915f80e53ef135a7bfcb6ced9b2f2a50ebdb8b316cc48a4f2553fa067a1d6fc0bc4498774a9f1990a535651b8 SHA512 (guava-32.1.3.tar.gz) = 8efd8072e0aafaa851e18a69af011cbaeba207a7ee2dbe2daee9f70729c1c785d054197e6bf032d30065245070088f9f2d7f1a01f244b00325a3ede9d00fb9ec