[jackson-annotations] update to 2.4.1
gil
gil at fedoraproject.org
Thu Jul 3 17:45:11 UTC 2014
commit e6debef3ea5b7cdbb5a661ee7326f6625336c651
Author: gil <puntogil at libero.it>
Date: Thu Jul 3 19:45:15 2014 +0200
update to 2.4.1
.gitignore | 1 +
jackson-annotations.spec | 28 +++++++++++++++-------------
sources | 2 +-
3 files changed, 17 insertions(+), 14 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32fa9b6..ae4944a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
/jackson-annotations-2.2.2.tar.gz
+/jackson-annotations-2.4.1.tar.gz
diff --git a/jackson-annotations.spec b/jackson-annotations.spec
index e43e9e9..c72880c 100644
--- a/jackson-annotations.spec
+++ b/jackson-annotations.spec
@@ -1,16 +1,15 @@
Name: jackson-annotations
-Version: 2.2.2
-Release: 5%{?dist}
+Version: 2.4.1
+Release: 1%{?dist}
Summary: Core annotations for Jackson data processor
License: ASL 2.0
URL: http://wiki.fasterxml.com/JacksonHome
Source0: https://github.com/FasterXML/jackson-annotations/archive/%{name}-%{version}.tar.gz
-# jackson-annotations package don't include the license file
-# https://github.com/FasterXML/jackson-annotations/issues/14
-Source1: http://www.apache.org/licenses/LICENSE-2.0.txt
-
-BuildRequires: mvn(com.fasterxml:oss-parent) >= 10
-BuildRequires: java-devel
+%if %{?fedora} > 20
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:)
+%else
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent)
+%endif
BuildRequires: maven-local
BuildRequires: maven-enforcer-plugin
@@ -36,8 +35,8 @@ 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 .
+sed -i 's/\r//' LICENSE
%build
@@ -48,12 +47,15 @@ sed -i 's/\r//' LICENSE-2.0.txt
%mvn_install
%files -f .mfiles
-%doc LICENSE-2.0.txt README.md release-notes/*
+%doc LICENSE README.md release-notes/*
%files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%doc LICENSE
%changelog
+* Wed Jul 02 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
@@ -78,4 +80,4 @@ sed -i 's/\r//' LICENSE-2.0.txt
- renamed jackson2-annotations
* 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 0f6e50b..b253caf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-1e74ff807b9d3de762f1e41152e9d623 jackson-annotations-2.2.2.tar.gz
+e7f7b5ebd1b340c6ca32e231ea72adc1 jackson-annotations-2.4.1.tar.gz
More information about the scm-commits
mailing list