From 45b92dd7e7f1a78d843ae2b501ddf46ac7a75660 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Feb 06 2017 14:16:30 +0000 Subject: Add conditional for ssh --- diff --git a/apache-ivy.spec b/apache-ivy.spec index 67bc9c6..e48c577 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,6 +1,8 @@ +%bcond_without ssh + Name: apache-ivy Version: 2.4.0 -Release: 5%{?dist} +Release: 6%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -31,9 +33,11 @@ BuildRequires: apache-commons-parent BuildRequires: sonatype-oss-parent BuildRequires: apache-parent BuildRequires: ivy-local >= 4 +%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 @@ -45,7 +49,6 @@ reporting and publication. %package javadoc Summary: API Documentation for ivy -Group: Development/Tools %description javadoc JavaDoc documentation for %{name} @@ -55,6 +58,15 @@ JavaDoc documentation for %{name} %patch0 %patch1 -p1 +%if %{without ssh} +%pom_remove_dep :jsch +%pom_remove_dep :jsch.agentproxy +%pom_remove_dep :jsch.agentproxy.connector-factory +%pom_remove_dep :jsch.agentproxy.jsch +rm -r src/java/org/apache/ivy/plugins/repository/{ssh,sftp} +rm src/java/org/apache/ivy/plugins/resolver/*{Ssh,SFTP}*.java +%endif + %mvn_alias : jayasoft:ivy %mvn_file : %{name}/ivy ivy @@ -99,6 +111,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %license LICENSE NOTICE %changelog +* Mon Feb 06 2017 Michael Simacek - 2.4.0-6 +- Add conditional for ssh + * Wed Feb 03 2016 Fedora Release Engineering - 2.4.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild