diff --git a/guava-build.tar.xz b/guava-build.tar.xz index aee1fdf..7fe2547 100644 --- a/guava-build.tar.xz +++ b/guava-build.tar.xz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b02e359c3be4697175cd19498fc20dba83c6ac3d6d1244de8ad35298e3dd04c1 -size 3428 +oid sha256:1f37f7e4a42abe107bb6916a8bcb172089fb47a70e0cf6b96a17f9a2f60270af +size 2900 diff --git a/guava.spec b/guava.spec index 413419d..ecc530e 100644 --- a/guava.spec +++ b/guava.spec @@ -77,7 +77,9 @@ 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_remove_dep -r :failureaccess annotations=$( find -name '*.java' \ @@ -107,19 +109,16 @@ done %build mkdir -p lib build-jar-repository -s lib junit jsr-305 -%ant -Dtest.skip=true package javadoc +%{ant} -Dtest.skip=true package javadoc %install # jars install -dm 0755 %{buildroot}%{_javadir}/%{name} -install -pm 0644 futures/failureaccess/target/failureaccess-1.0.1.jar %{buildroot}%{_javadir}/%{name}/failureaccess.jar install -pm 0644 %{name}/target/%{name}-%{version}*.jar %{buildroot}%{_javadir}/%{name}/%{name}.jar install -pm 0644 %{name}-testlib/target/%{name}-testlib-%{version}*.jar %{buildroot}%{_javadir}/%{name}/%{name}-testlib.jar # poms install -dm 0755 %{buildroot}%{_mavenpomdir}/%{name} -install -pm 0644 futures/failureaccess/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/failureaccess.pom -%add_maven_depmap %{name}/failureaccess.pom %{name}/failureaccess.jar -f %{name} install -pm 0644 %{name}/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}.pom %add_maven_depmap %{name}/%{name}.pom %{name}/%{name}.jar -f %{name} install -pm 0644 %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{name}-testlib.pom @@ -127,7 +126,6 @@ install -pm 0644 %{name}-testlib/pom.xml %{buildroot}%{_mavenpomdir}/%{name}/%{n # javadoc install -dm 0755 %{buildroot}%{_javadocdir}/%{name} -cp -r futures/failureaccess/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/failureaccess cp -r %{name}/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name} cp -r %{name}-testlib/target/site/apidocs %{buildroot}%{_javadocdir}/%{name}/%{name}-testlib %fdupes -s %{buildroot}%{_javadocdir}