[jackson-module-jaxb-annotations] update to 2.4.1
gil
gil at fedoraproject.org
Fri Jul 4 09:23:56 UTC 2014
commit 979571371e50ecc10bb85de7d4918309b5cb0a52
Author: gil <puntogil at libero.it>
Date: Fri Jul 4 11:24:00 2014 +0200
update to 2.4.1
.gitignore | 1 +
LICENSE-2.0.txt | 202 ----------------------------------
jackson-module-jaxb-annotations.spec | 29 +++--
sources | 2 +-
4 files changed, 18 insertions(+), 216 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3b988e0..b97d18e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jackson-module-jaxb-annotations-2.2.2.tar.gz
+/jackson-module-jaxb-annotations-2.4.1.tar.gz
diff --git a/jackson-module-jaxb-annotations.spec b/jackson-module-jaxb-annotations.spec
index 90a550e..a34ab9d 100644
--- a/jackson-module-jaxb-annotations.spec
+++ b/jackson-module-jaxb-annotations.spec
@@ -1,17 +1,16 @@
Name: jackson-module-jaxb-annotations
-Version: 2.2.2
-Release: 5%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: JAXB annotations support for Jackson (2.x)
License: ASL 2.0
URL: http://wiki.fasterxml.com/JacksonJAXBAnnotations
Source0: https://github.com/FasterXML/jackson-module-jaxb-annotations/archive/%{name}-%{version}.tar.gz
-# jackson-module-jaxb-annotations package don't include the license file
-# https://github.com/FasterXML/jackson-module-jaxb-annotations/issues/21
-Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-
-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
# Require glassfish-jaxb-api
BuildRequires: mvn(javax.xml.bind:jaxb-api)
BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core)
@@ -49,8 +48,9 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
-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
@@ -61,12 +61,15 @@ sed -i 's/\r//' LICENSE-2.0.txt
%mvn_install
%files -f .mfiles
-%doc LICENSE-2.0.txt README.md
+%doc LICENSE NOTICE README.md
%files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%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
@@ -91,4 +94,4 @@ sed -i 's/\r//' LICENSE-2.0.txt
- renamed jackson2-module-jaxb-annotations
* Thu Sep 13 2012 gil cattaneo <puntogil at libero.it> 2.0.5-1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index edf1fff..c0862da 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-11638c3088704e99f7b5fa7b75cb2ade jackson-module-jaxb-annotations-2.2.2.tar.gz
+f4c1e95bb813d7d22fd4c43c8a60ac75 jackson-module-jaxb-annotations-2.4.1.tar.gz
More information about the scm-commits
mailing list