diff --git a/jackson-jaxrs-providers.spec b/jackson-jaxrs-providers.spec index 604a4ee..2fc059b 100644 --- a/jackson-jaxrs-providers.spec +++ b/jackson-jaxrs-providers.spec @@ -1,10 +1,6 @@ -%if 0%{?fedora} -# Unavailable deps -%bcond_with cbor -%endif Name: jackson-jaxrs-providers Version: 2.4.1 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Jackson JAX-RS providers License: ASL 2.0 URL: http://wiki.fasterxml.com/JacksonHome @@ -17,10 +13,7 @@ BuildRequires: mvn(com.fasterxml.jackson:jackson-parent) %endif BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind) -%if %{with cbor} -# https://bugzilla.redhat.com/show_bug.cgi?id=1116363 BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-cbor) -%endif BuildRequires: mvn(com.fasterxml.jackson.dataformat:jackson-dataformat-smile) BuildRequires: mvn(com.fasterxml.jackson.module:jackson-module-jaxb-annotations) BuildRequires: mvn(javax.ws.rs:jsr311-api) @@ -62,14 +55,12 @@ following data formats: * Smile (https://github.com/FasterXML/jackson-dataformat-smile) * XML (https://github.com/FasterXML/jackson-dataformat-xml) -%if %{with cbor} %package -n jackson-jaxrs-cbor-provider Summary: Jackson-JAXRS-CBOR %description -n jackson-jaxrs-cbor-provider Functionality to handle CBOR encoded input/output for JAX-RS implementations (like Jersey and RESTeasy) using standard Jackson data binding. -%endif %package -n jackson-jaxrs-json-provider Summary: Jackson-JAXRS-JSON @@ -126,12 +117,6 @@ rm xml/src/test/java/com/fasterxml/jackson/jaxrs/xml/TestCanDeserialize.java \ %pom_remove_dep org.jboss.resteasy:resteasy-jackson2-provider json rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProviderLoadingTest.java -# Disabled for now -# Unavailable deps -%if %{without cbor} -%pom_disable_module cbor -%endif - %build %mvn_package ":jackson-jaxrs-providers" %{name} @@ -145,10 +130,8 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider %files -f .mfiles-%{name} %doc LICENSE NOTICE README.md release-notes/* -%if %{with cbor} %files -n jackson-jaxrs-cbor-provider -f .mfiles-jackson-jaxrs-cbor-provider %doc LICENSE NOTICE -%endif %files -n jackson-jaxrs-json-provider -f .mfiles-jackson-jaxrs-json-provider %doc LICENSE NOTICE @@ -165,6 +148,9 @@ rm json/src/test/java/com/fasterxml/jackson/jaxrs/json/resteasy/RestEasyProvider %doc LICENSE NOTICE %changelog +* Wed Jul 09 2014 gil cattaneo 2.4.1-2 +- enable jackson-jaxrs-cbor-provider + * Fri Jul 04 2014 gil cattaneo 2.4.1-1 - update to 2.4.1