diff --git a/apache-ivy.spec b/apache-ivy.spec index a2772f7..d976bf9 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,9 +1,10 @@ %bcond_without ssh +%bcond_without vfs %bcond_without bouncycastle Name: apache-ivy Version: 2.4.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -23,7 +24,9 @@ Provides: ivy = %{version}-%{release} BuildRequires: ant BuildRequires: ant-contrib BuildRequires: ant-testutil +%if %{with vfs} BuildRequires: apache-commons-vfs +%endif BuildRequires: apache-commons-lang %if %{with bouncycastle} BuildRequires: bouncycastle @@ -95,7 +98,13 @@ sed -i s/ant-trax/ant/ ivy.xml sed -i /bouncycastle/s/jdk14/jdk16/ ivy.xml # Port from commons-vfs 1.x to 2.x +%if %{with vfs} sed -i "s/commons.vfs/&2/" src/java/org/apache/ivy/plugins/repository/vfs/* +%else +sed -i /commons-vfs/d ivy.xml +rm -rf src/java/org/apache/ivy/plugins/repository/vfs +rm -rf src/java/org/apache/ivy/plugins/resolver/VfsResolver.java +%endif # Remove prebuilt documentation rm -rf doc build/doc @@ -122,6 +131,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %license LICENSE NOTICE %changelog +* Tue Jul 17 2018 Mikolaj Izdebski - 2.4.0-14 +- Allow building without vfs support + * Thu Jul 12 2018 Fedora Release Engineering - 2.4.0-13 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild