diff --git a/modello.spec b/modello.spec index aa59b4b..d4ee335 100644 --- a/modello.spec +++ b/modello.spec @@ -1,8 +1,9 @@ %bcond_without jackson +%bcond_without snakeyaml Name: modello Version: 1.9.1 -Release: 5%{?dist} +Release: 6%{?dist} Epoch: 0 Summary: Modello Data Model toolkit # The majority of files are under MIT license, but some of them are @@ -28,12 +29,14 @@ BuildRequires: mvn(org.codehaus.plexus:plexus-container-default) BuildRequires: mvn(org.codehaus.plexus:plexus-utils) BuildRequires: mvn(org.jsoup:jsoup) BuildRequires: mvn(org.sonatype.plexus:plexus-build-api) -BuildRequires: mvn(org.yaml:snakeyaml) %if %{with jackson} BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) %endif +%if %{with snakeyaml} +BuildRequires: mvn(org.yaml:snakeyaml) +%endif %description Modello is a Data Model toolkit in use by the Apache Maven Project. @@ -66,6 +69,11 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %pom_remove_dep :modello-plugin-jsonschema modello-maven-plugin %endif +%if %{without snakeyaml} +%pom_disable_module modello-plugin-snakeyaml modello-plugins +%pom_remove_dep :modello-plugin-snakeyaml modello-maven-plugin +%endif + %build # skip tests because we have too old xmlunit in Fedora now (1.0.8) %mvn_build -f -- -Dmaven.version=3.1.1 @@ -76,7 +84,6 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %jpackage_script org.codehaus.modello.ModelloCli "" "" modello:plexus-containers/plexus-container-default:plexus/classworlds:plexus/utils:plexus/plexus-build-api:xbean/xbean-reflect:guava %{name} true %files -f .mfiles -%dir %{_javadir}/%{name} %doc LICENSE %{_bindir}/* @@ -84,6 +91,9 @@ sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml %doc LICENSE %changelog +* Tue Jul 17 2018 Mikolaj Izdebski - 0:1.9.1-6 +- Allow conditionally building without snakeyaml + * Fri Jul 13 2018 Fedora Release Engineering - 0:1.9.1-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild