diff --git a/modello.spec b/modello.spec index 37bd529..2970330 100644 --- a/modello.spec +++ b/modello.spec @@ -1,5 +1,3 @@ -%bcond_without jackson -%bcond_without snakeyaml Name: modello Version: 1.9.1 @@ -29,14 +27,6 @@ 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) -%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 # Explicit javapackages-tools requires since modello script uses # /usr/share/java-utils/java-functions Requires: javapackages-tools @@ -65,17 +55,13 @@ cp -p %{SOURCE1} LICENSE # Avoid using Maven 2.x APIs sed -i s/maven-project/maven-core/ modello-maven-plugin/pom.xml -%if %{without jackson} %pom_disable_module modello-plugin-jackson modello-plugins %pom_disable_module modello-plugin-jsonschema modello-plugins %pom_remove_dep :modello-plugin-jackson modello-maven-plugin %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)