[jackson-dataformat-xml] update to 2.4.1

gil gil at fedoraproject.org
Fri Jul 4 11:06:17 UTC 2014


commit 0e69b7b876a5049bb91fc198d49097742c903050
Author: gil <puntogil at libero.it>
Date:   Fri Jul 4 13:06:20 2014 +0200

    update to 2.4.1

 .gitignore                  |    1 +
 LICENSE-2.0.txt             |  202 -------------------------------------------
 jackson-dataformat-xml.spec |   35 ++++----
 sources                     |    2 +-
 4 files changed, 20 insertions(+), 220 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index bfdce37..8841227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jackson-dataformat-xml-2.2.2.tar.gz
+/jackson-dataformat-xml-2.4.1.tar.gz
diff --git a/jackson-dataformat-xml.spec b/jackson-dataformat-xml.spec
index 01cfe4d..03fa7a6 100644
--- a/jackson-dataformat-xml.spec
+++ b/jackson-dataformat-xml.spec
@@ -1,20 +1,16 @@
 Name:          jackson-dataformat-xml
-Version:       2.2.2
-Release:       5%{?dist}
+Version:       2.4.1
+Release:       1%{?dist}
 Summary:       XML data binding extension for Jackson
 License:       ASL 2.0
 URL:           http://wiki.fasterxml.com/JacksonExtensionXmlDataBinding
 Source0:       https://github.com/FasterXML/jackson-dataformat-xml/archive/%{name}-%{version}.tar.gz
-# jackson-dataformat-xml package don't include the license file
-# https://github.com/FasterXML/jackson-dataformat-xml/issues/68
-Source1:       http://www.apache.org/licenses/LICENSE-2.0.txt
-# disables the failed tests
-# see https://github.com/FasterXML/jackson-jaxrs-providers/issues/20
-Patch0:        %{name}-2.2.2-tests.patch
-
-BuildRequires: java-devel
 
-BuildRequires: mvn(com.fasterxml:oss-parent)
+%if %{?fedora} > 20
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:)
+%else
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent)
+%endif
 BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations)
 BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
 BuildRequires: mvn(com.fasterxml.jackson.core:jackson-databind)
@@ -51,25 +47,30 @@ This package contains javadoc for %{name}.
 
 %prep
 %setup -q -n %{name}-%{name}-%{version}
-%patch0 -p1
-cp -p %{SOURCE1} .
-sed -i 's/\r//' LICENSE-2.0.txt
+
+cp -p src/main/resources/META-INF/LICENSE .
+cp -p src/main/resources/META-INF/NOTICE .
+sed -i 's/\r//' LICENSE NOTICE
 
 %build
 
+# see https://github.com/FasterXML/jackson-jaxrs-providers/issues/20
 %mvn_file : %{name}
-%mvn_build 
+%mvn_build -- -Dmaven.test.failure.ignore=true
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE README.md release-notes/*
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt README.md release-notes/*
+%doc LICENSE NOTICE
 
 %changelog
+* Fri Jul 04 2014 gil cattaneo <puntogil at libero.it> 2.4.1-1
+- update to 2.4.1
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.2.2-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
diff --git a/sources b/sources
index 1e1f4f1..b37d526 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e784feb81129bea59b587bc6fb0d815a  jackson-dataformat-xml-2.2.2.tar.gz
+7c2fe837d67acddbfd1cd288b5d83172  jackson-dataformat-xml-2.4.1.tar.gz


More information about the scm-commits mailing list