From ee12bee294ec19e3d39795c84c188a3cb7bcc1f4 Mon Sep 17 00:00:00 2001
From: Marian Koncek <mkoncek@redhat.com>
Date: Aug 13 2019 07:15:51 +0000
Subject: Package failureaccess as a submodule


---

diff --git a/guava.spec b/guava.spec
index f166962..6124287 100644
--- a/guava.spec
+++ b/guava.spec
@@ -60,9 +60,6 @@ find . -name '*.jar' -delete
 %pom_remove_dep -r :j2objc-annotations
 %pom_remove_dep -r org.checkerframework:
 %pom_remove_dep -r :listenablefuture
-%pom_remove_dep -r :failureaccess
-
-cp -r futures/failureaccess/src/com/google/common/util/concurrent/internal/ guava/src/com/google/common/
 
 annotations=$(
     find -name '*.java' \
@@ -80,6 +77,11 @@ annotations=$(
 find -name '*.java' | xargs sed -ri \
     "s/^import .*\.($annotations);//;s/@($annotations)"'\>\s*(\((("[^"]*")|([^)]*))\))?//g'
 
+%mvn_package "com.google.guava:failureaccess" guava
+
+%pom_xpath_inject pom:modules \
+"<module>futures/failureaccess</module>"
+
 %mvn_package "com.google.guava:guava-bom" __noinstall
 
 %build