Hello community,
here is the log from the commit of package apache-ivy for openSUSE:Factory checked in at 2019-07-08 14:59:14
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/apache-ivy (Old)
and /work/SRC/openSUSE:Factory/.apache-ivy.new.4615 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "apache-ivy"
Mon Jul 8 14:59:14 2019 rev:17 rq:713014 version:2.4.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/apache-ivy/apache-ivy.changes 2019-04-14 12:20:20.735611679 +0200
+++ /work/SRC/openSUSE:Factory/.apache-ivy.new.4615/apache-ivy.changes 2019-07-08 14:59:15.406374146 +0200
@@ -1,0 +2,6 @@
+Tue Jul 2 09:22:21 UTC 2019 - Fridrich Strba
+
+- Add possibility to build with ssh and vfs integration, since
+ we have all the dependencies in openSUSE.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ apache-ivy.spec ++++++
--- /var/tmp/diff_new_pack.7GdyzD/_old 2019-07-08 14:59:16.410375664 +0200
+++ /var/tmp/diff_new_pack.7GdyzD/_new 2019-07-08 14:59:16.418375676 +0200
@@ -16,6 +16,8 @@
#
+%bcond_without ssh
+%bcond_without vfs
Name: apache-ivy
Version: 2.4.0
Release: 0
@@ -39,6 +41,14 @@
Provides: ivy = %{version}-%{release}
Obsoletes: ivy < %{version}-%{release}
BuildArch: noarch
+%if %{with vfs}
+BuildRequires: apache-commons-vfs2
+%endif
+%if %{with ssh}
+BuildRequires: jsch-agent-proxy-connector-factory
+BuildRequires: jsch-agent-proxy-core
+BuildRequires: jsch-agent-proxy-jsch
+%endif
%description
Apache Ivy is a tool for managing (recording, tracking, resolving and
@@ -70,23 +80,39 @@
# 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
+# Port from commons-vfs 1.x to 2.x
+%if %{with vfs}
+sed -i "s/commons.vfs/&2/" {src,test}/java/org/apache/ivy/plugins/repository/vfs/*
+%else
+sed -i /commons-vfs/d ivy.xml
sed '/vfs.*=.*org.apache.ivy.plugins.resolver.VfsResolver/d' -i \
src/java/org/apache/ivy/core/settings/typedef.properties
+rm -rf src/java/org/apache/ivy/plugins/repository/vfs
+rm -rf src/java/org/apache/ivy/plugins/resolver/VfsResolver.java
+%endif
+%if %{without ssh}
rm -r src/java/org/apache/ivy/plugins/repository/{ssh,sftp}
rm src/java/org/apache/ivy/plugins/resolver/*{Ssh,SFTP}*.java
+%endif
%build
# Craft class path
mkdir -p lib
build-jar-repository lib ant ant/ant-nodeps oro jsch commons-httpclient
+export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient)
+%if %{with vfs}
+build-jar-repository lib commons-vfs2
+export CLASSPATH=${CLASSPATH}:$(build-classpath commons-vfs2)
+%endif
+%if %{with ssh}
+build-jar-repository lib jsch.agentproxy.core \
+ jsch.agentproxy.connector-factory \
+ jsch.agentproxy.jsch
+export CLASSPATH=${CLASSPATH}:$(build-classpath jsch.agentproxy.core jsch.agentproxy.connector-factory jsch.agentproxy.jsch)
+%endif
# Build
-export CLASSPATH=$(build-classpath ant ant/ant-nodeps oro jsch commons-httpclient)
ant -Dtarget.ivy.version=%{version} /localivy /offline jar javadoc
%install