From aad699ef126f4ceb56997a1ef3b2c1142c1be503 Mon Sep 17 00:00:00 2001 From: Mikolaj Izdebski Date: Sep 23 2017 10:03:12 +0000 Subject: Conditionally allow building without asciidoc --- diff --git a/javapackages-tools.spec b/javapackages-tools.spec index 206f610..995cfa6 100644 --- a/javapackages-tools.spec +++ b/javapackages-tools.spec @@ -2,6 +2,7 @@ # provided pseudo-artifacts: com.sun:tools and sun.jdk:jconsole. %global __requires_exclude_from %{?__requires_exclude_from:%__requires_exclude_from|}/maven-metadata/javapackages-metadata.xml$ +%bcond_without asciidoc %bcond_without gradle %bcond_without tests %bcond_with xmvn_javadoc @@ -20,7 +21,7 @@ Name: javapackages-tools Version: 5.0.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: Macros and scripts for Java packaging support @@ -34,12 +35,18 @@ BuildArch: noarch BuildRequires: coreutils BuildRequires: which BuildRequires: make +%if %{with asciidoc} BuildRequires: asciidoc BuildRequires: xmlto +%endif BuildRequires: %{python_prefix}-devel BuildRequires: %{python_prefix}-lxml BuildRequires: %{python_prefix}-setuptools +%if !0%{?_module_build} +# XXX python-nose is not part of any module yet, but it should get +# modularized one day, right? mizdebsk, Sep 2017 BuildRequires: %{python_prefix}-nose +%endif BuildRequires: %{python_prefix}-six Requires: coreutils @@ -138,6 +145,11 @@ This package provides non-essential macros and scripts to support Java packaging %patch0 -p1 +%if %{without asciidoc} +sed -i '/^manpage /d' build +sed -i '/${mandir}/d' install +%endif + %build %configure --pyinterpreter=%{python_interpreter} \ --default_jdk=%{default_jdk} --default_jre=%{default_jre} \ @@ -159,9 +171,11 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %endif %if %{with tests} +%if !0%{?_module_build} %check ./check %endif +%endif %files -f files-common @@ -179,6 +193,9 @@ rm -rf %{buildroot}%{_mandir}/man7/gradle_build.7 %license LICENSE %changelog +* Sat Sep 23 2017 Mikolaj Izdebski - 5.0.0-9 +- Conditionally allow building without asciidoc + * Thu Sep 7 2017 Mikolaj Izdebski - 5.0.0-8 - Allow manpages to be either compressed or not