rpms/guava
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Update to upstream version 28.0

Browse Source
This commit is contained in:
Marian Koncek 2019-08-05 15:58:47 +02:00
parent e2e5912246
commit 125f79cf51
3 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -8,3 +8,4 @@
/v20.0.tar.gz /v20.0.tar.gz
/v24.0.tar.gz /v24.0.tar.gz
/v25.0.tar.gz /v25.0.tar.gz
/v28.0.tar.gz

15
guava.spec
View File

@ -1,6 +1,6 @@
Name: guava Name: guava
Version: 25.0 Version: 28.0
Release: 4%{?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
@ -58,6 +58,12 @@ find . -name '*.jar' -delete
%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:
%pom_remove_dep -r :listenablefuture
%pom_xpath_inject pom:modules \
"<module>futures/failureaccess</module>"
%mvn_package "com.google.guava:failureaccess" guava
annotations=$( annotations=$(
find -name '*.java' \ find -name '*.java' \
@ -75,6 +81,8 @@ annotations=$(
find -name '*.java' | xargs sed -ri \ find -name '*.java' | xargs sed -ri \
"s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g' "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
%mvn_package "com.google.guava:guava-bom" __noinstall
%build %build
# Tests fail on Koji due to insufficient memory, # Tests fail on Koji due to insufficient memory,
# see https://bugzilla.redhat.com/show_bug.cgi?id=1332971 # see https://bugzilla.redhat.com/show_bug.cgi?id=1332971
@ -90,6 +98,9 @@ find -name '*.java' | xargs sed -ri \
%files testlib -f .mfiles-guava-testlib %files testlib -f .mfiles-guava-testlib
%changelog %changelog
* Thu Aug 01 2019 Marian Koncek <mkoncek@redhat.com> - 28.0-1
- Update to upstream version 28.0
* Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 25.0-4 * Fri May 24 2019 Mikolaj Izdebski <mizdebsk@redhat.com> - 25.0-4
- Mass rebuild for javapackages-tools 201901 - Mass rebuild for javapackages-tools 201901

2
sources
View File

@ -1 +1 @@
SHA512 (v25.0.tar.gz) = d846d18b336169b2d07ee0ac5109000e4d5e6534051200b5d525b9294f41e44366483e79e2adfb59a8a45603601e8e86e9347eb2b2fd955708031fe7eedfaf26 SHA512 (v28.0.tar.gz) = 0d72c6c74958bea55cc1f1d6fb75061c9bd46915582f6c9b2ed07ee06b79b20094330621f3d32165a24e401445b7bdff4fcc85002cf3a6873c21bd4bfa4b937f