[apache-ivy] Enable VFS resolver

[Mikolaj Izdebski]

commit 4e8db9b3e81e74561a8e2f8f8feb564fe25d4001
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date:   Thu Dec 12 07:42:55 2013 +0100

    Enable VFS resolver

 apache-ivy.spec |   18 +++++++++---------
 1 files changed, 9 insertions(+), 9 deletions(-)
---
diff --git a/apache-ivy.spec b/apache-ivy.spec
index a0c4fb4..5199f6b 100644
--- a/apache-ivy.spec
+++ b/apache-ivy.spec
@@ -1,6 +1,6 @@
 Name:           apache-ivy
 Version:        2.3.0
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Java-based dependency manager
 
 Group:          Development/Tools
@@ -12,6 +12,7 @@ BuildArch:      noarch
 Provides:       ivy = %{version}-%{release}
 
 BuildRequires:  ant
+BuildRequires:  apache-commons-vfs
 BuildRequires:  bouncycastle
 BuildRequires:  bouncycastle-pg
 BuildRequires:  jakarta-commons-httpclient
@@ -54,20 +55,16 @@ sed -i s/ant-trax/ant/ ivy.xml
 # Fedora bouncycastle packages provide -jdk16 artifacts only
 sed -i /bouncycastle/s/jdk14/jdk16/ ivy.xml
 
+# Port from commons-vfs 1.x to 2.x
+sed -i "s/commons.vfs/&2/" src/java/org/apache/ivy/plugins/repository/vfs/*
+
 %build
 # Remove prebuilt documentation
 rm -rf doc build/doc
 
-# How to properly disable a plugin?
-# we disable vfs plugin since commons-vfs is not available
-rm -rf src/java/org/apache/ivy/plugins/repository/vfs \
-        src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
-sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
-        src/java/org/apache/ivy/core/settings/typedef.properties
-
 # Craft class path
 mkdir -p lib
-build-jar-repository lib ant jakarta-commons-httpclient jakarta-oro jsch 
+build-jar-repository lib ant commons-vfs jakarta-commons-httpclient jakarta-oro jsch
 
 # Build
 ant /localivy /offline -Dtarget.ivy.bundle.version=%{version} -Dtarget.ivy.bundle.version.qualifier= -Dtarget.ivy.version=%{version} jar javadoc
@@ -90,6 +87,9 @@ echo "ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name}
 %doc LICENSE
 
 %changelog
+* Thu Dec 12 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.0-5
+- Enable VFS resolver
+
 * Wed Dec  4 2013 Mikolaj Izdebski <mizdebsk at redhat.com> - 2.3.0-4
 - Install POM files, resolves: rhbz#1032258
 - Remove explicit requires; auto-requires are in effect now