From a0ed095416294430fe30ffb2fbccb63c50586942 Mon Sep 17 00:00:00 2001 From: Fabio Valentini Date: Aug 14 2019 14:21:43 +0000 Subject: disable ssh, bouncycastle, and vfs support --- diff --git a/.gitignore b/.gitignore index ba65738..112de33 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,7 @@ -apache-ivy-2.1.0-src.tar.gz +/results_* +/*.src.rpm + +/apache-ivy-2.1.0-src.tar.gz /apache-ivy-2.2.0-src.tar.gz /apache-ivy-2.3.0-src.tar.gz /apache-ivy-2.4.0-src.tar.gz diff --git a/apache-ivy.spec b/apache-ivy.spec index 967d0e7..3c29c47 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,10 +1,10 @@ -%bcond_without ssh -%bcond_without vfs -%bcond_without bouncycastle +%bcond_with bouncycastle +%bcond_with ssh +%bcond_with vfs Name: apache-ivy Version: 2.4.0 -Release: 17%{?dist} +Release: 18%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -124,6 +124,14 @@ rm test/java/org/apache/ivy/util/url/HttpclientURLHandlerTest.java rm test/java/org/apache/ivy/plugins/resolver/IBiblioResolverTest.java rm test/java/org/apache/ivy/util/url/ArtifactoryListingTest.java +%if %{without vfs} +rm test/java/org/apache/ivy/plugins/repository/vfs/VfsRepositoryTest.java +rm test/java/org/apache/ivy/plugins/repository/vfs/VfsResourceTest.java +rm test/java/org/apache/ivy/plugins/repository/vfs/VfsTestHelper.java +rm test/java/org/apache/ivy/plugins/repository/vfs/VfsURI.java +rm test/java/org/apache/ivy/plugins/resolver/VfsResolverTest.java +%endif + # XXX Disable test which fails due to non-existing files rm test/java/org/apache/ivy/ant/IvyBuildListTest.java @@ -148,6 +156,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %license LICENSE NOTICE %changelog +* Wed Aug 14 2019 Fabio Valentini - 2.4.0-18 +- Disable ssh, bouncycastle, and vfs support. + * Wed Jul 24 2019 Fedora Release Engineering - 2.4.0-17 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild