From 951bc8dde99332a7bfd7e6da08adea99f43de50f Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Tue, 31 Jan 2017 23:55:56 +0100 Subject: [PATCH] Allow to conditionally build without gradle --- javapackages-tools.spec | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 8ac7c91..a199b76 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -5,11 +5,12 @@ # Avoid circular dependency on itself when bootstrapping %{!?_with_bootstrap: %global bootstrap 0} +%bcond_without gradle %bcond_without tests Name: javapackages-tools Version: 4.7.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: Macros and scripts for Java packaging support @@ -78,6 +79,7 @@ Requires: maven-surefire-provider-testng %description -n maven-local This package provides macros and scripts to support packaging Maven artifacts. +%if %{with gradle} %package -n gradle-local Summary: Local mode for Gradle Requires: %{name} = %{version}-%{release} @@ -88,6 +90,7 @@ Requires: xmvn-connector-gradle >= 2 %description -n gradle-local This package implements local mode for Gradle, which allows artifact resolution using XMvn resolver. +%endif %package -n ivy-local Summary: Local mode for Apache Ivy @@ -141,6 +144,12 @@ pushd python %{__python3} setup.py install -O1 --skip-build --root %{buildroot} popd +%if %{without gradle} +rm -rf %{buildroot}%{_bindir}/gradle-local +rm -rf %{buildroot}%{_datadir}/gradle-local +rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7.gz +%endif + %if %{with tests} %check ./check @@ -152,7 +161,9 @@ popd %files -n maven-local -f files-maven +%if %{with gradle} %files -n gradle-local -f files-gradle +%endif %files -n ivy-local -f files-ivy @@ -161,6 +172,9 @@ popd %{python3_sitelib}/javapackages* %changelog +* Tue Jan 31 2017 Mikolaj Izdebski - 4.7.0-13 +- Allow to conditionally build without gradle + * Tue Dec 20 2016 Mikolaj Izdebski - 4.7.0-12 - Non-bootstrap build