diff --git a/.gitignore b/.gitignore index ce1d50b..0402a7d 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ /v20.0.tar.gz /v24.0.tar.gz /v25.0.tar.gz +/v28.0.tar.gz diff --git a/guava.spec b/guava.spec index 2908b36..88e5dd8 100644 --- a/guava.spec +++ b/guava.spec @@ -1,6 +1,6 @@ Name: guava -Version: 25.0 -Release: 4%{?dist} +Version: 28.0 +Release: 1%{?dist} Summary: Google Core Libraries for Java # Most of the code is under ASL 2.0 # 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 :j2objc-annotations %pom_remove_dep -r org.checkerframework: +%pom_remove_dep -r :listenablefuture + +%pom_xpath_inject pom:modules \ +"futures/failureaccess" + +%mvn_package "com.google.guava:failureaccess" guava annotations=$( find -name '*.java' \ @@ -75,6 +81,8 @@ annotations=$( find -name '*.java' | xargs sed -ri \ "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g' +%mvn_package "com.google.guava:guava-bom" __noinstall + %build # Tests fail on Koji due to insufficient memory, # 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 %changelog +* Thu Aug 01 2019 Marian Koncek - 28.0-1 +- Update to upstream version 28.0 + * Fri May 24 2019 Mikolaj Izdebski - 25.0-4 - Mass rebuild for javapackages-tools 201901 diff --git a/sources b/sources index 62006bf..c165a59 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (v25.0.tar.gz) = d846d18b336169b2d07ee0ac5109000e4d5e6534051200b5d525b9294f41e44366483e79e2adfb59a8a45603601e8e86e9347eb2b2fd955708031fe7eedfaf26 +SHA512 (v28.0.tar.gz) = 0d72c6c74958bea55cc1f1d6fb75061c9bd46915582f6c9b2ed07ee06b79b20094330621f3d32165a24e401445b7bdff4fcc85002cf3a6873c21bd4bfa4b937f