From 6d1c44f7d21cc6e1e8dbf8d3124b23ff31858860 Mon Sep 17 00:00:00 2001 From: Michael Simacek Date: Feb 14 2017 11:41:18 +0000 Subject: Add conditional for bouncycastle --- diff --git a/apache-ivy.spec b/apache-ivy.spec index e48c577..13eca1e 100644 --- a/apache-ivy.spec +++ b/apache-ivy.spec @@ -1,8 +1,9 @@ %bcond_without ssh +%bcond_without bouncycastle Name: apache-ivy Version: 2.4.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: Java-based dependency manager License: ASL 2.0 @@ -24,8 +25,10 @@ BuildRequires: ant-contrib BuildRequires: ant-testutil BuildRequires: apache-commons-vfs BuildRequires: apache-commons-lang +%if %{with bouncycastle} BuildRequires: bouncycastle BuildRequires: bouncycastle-pg +%endif BuildRequires: jakarta-commons-httpclient BuildRequires: jsch BuildRequires: jakarta-oro @@ -67,6 +70,11 @@ rm -r src/java/org/apache/ivy/plugins/repository/{ssh,sftp} rm src/java/org/apache/ivy/plugins/resolver/*{Ssh,SFTP}*.java %endif +%if %{without bouncycastle} +%pom_remove_dep org.bouncycastle +rm src/java/org/apache/ivy/plugins/signer/bouncycastle/OpenPGPSignatureGenerator.java +%endif + %mvn_alias : jayasoft:ivy %mvn_file : %{name}/ivy ivy @@ -111,6 +119,9 @@ echo "apache-ivy/ivy" > $RPM_BUILD_ROOT%{_sysconfdir}/ant.d/%{name} %license LICENSE NOTICE %changelog +* Tue Feb 14 2017 Michael Simacek - 2.4.0-7 +- Add conditional for bouncycastle + * Mon Feb 06 2017 Michael Simacek - 2.4.0-6 - Add conditional for ssh