[jackson-databind] update to 2.4.1.1
gil
gil at fedoraproject.org
Thu Jul 3 18:13:07 UTC 2014
commit e11878eb9c824ccb25ea2bf8d63c560b84a36b62
Author: gil <puntogil at libero.it>
Date: Thu Jul 3 20:13:07 2014 +0200
update to 2.4.1.1
.gitignore | 1 +
LICENSE-2.0.txt | 202 --------------------
jackson-databind.spec | 36 ++--
lgpl-2.1.txt | 502 -------------------------------------------------
sources | 2 +-
5 files changed, 20 insertions(+), 723 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 485fb98..8894274 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jackson-databind-2.2.2.tar.gz
+/jackson-databind-2.4.1.1.tar.gz
diff --git a/jackson-databind.spec b/jackson-databind.spec
index 8e0eede..7d555c6 100644
--- a/jackson-databind.spec
+++ b/jackson-databind.spec
@@ -1,20 +1,17 @@
Name: jackson-databind
-Version: 2.2.2
-Release: 5%{?dist}
+Version: 2.4.1.1
+Release: 1%{?dist}
Summary: General data-binding package for Jackson (2.x)
License: ASL 2.0 and LGPLv2+
URL: http://wiki.fasterxml.com/JacksonHome
Source0: https://github.com/FasterXML/jackson-databind/archive/%{name}-%{version}.tar.gz
-# jackson-databind package don't include the license file
-# https://github.com/FasterXML/jackson-databind/issues/264
-Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-Source2: http://www.gnu.org/licenses/lgpl-2.1.txt
-
-BuildRequires: java-devel
-BuildRequires: mvn(com.fasterxml:oss-parent) >= 10
-BuildRequires: mvn(com.fasterxml.jackson.core:jackson-annotations) >= %{version}
-BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= %{version}
-
+%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) >= 2.4.1
+BuildRequires: mvn(com.fasterxml.jackson.core:jackson-core) >= 2.4.1
# test deps
BuildRequires: mvn(cglib:cglib)
BuildRequires: mvn(junit:junit)
@@ -48,9 +45,9 @@ This package contains javadoc for %{name}.
%prep
%setup -q -n %{name}-%{name}-%{version}
-cp -p %{SOURCE1} .
-cp -p %{SOURCE2} .
-sed -i 's/\r//' LICENSE-2.0.txt lgpl-2.1.txt
+cp -p src/main/resources/META-INF/LICENSE .
+cp -p src/main/resources/META-INF/NOTICE .
+sed -i 's/\r//' LICENSE NOTICE
# unavailable test deps
%pom_remove_dep org.hibernate:hibernate-cglib-repack
@@ -69,12 +66,15 @@ rm src/test/java/com/fasterxml/jackson/databind/ser/TestJdkTypes.java \
%mvn_install
%files -f .mfiles
-%doc LICENSE-2.0.txt lgpl-2.1.txt README.md release-notes/*
+%doc LICENSE NOTICE README.md release-notes/*
%files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt lgpl-2.1.txt
+%doc LICENSE NOTICE
%changelog
+* Thu Jul 03 2014 gil cattaneo <puntogil at libero.it> 2.4.1.1-1
+- update to 2.4.1.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
@@ -99,4 +99,4 @@ rm src/test/java/com/fasterxml/jackson/databind/ser/TestJdkTypes.java \
- renamed jackson2-databind
* Thu Sep 13 2012 gil cattaneo <puntogil at libero.it> 2.0.6-1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index 3692e16..d43f14f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8894f9e8efdf37c9caa7fadd49993994 jackson-databind-2.2.2.tar.gz
+119b9c2f8e3b46d7282bed211e3515a7 jackson-databind-2.4.1.1.tar.gz
More information about the scm-commits
mailing list