[jackson-core] update to 2.4.1

gil gil at fedoraproject.org
Thu Jul 3 17:48:23 UTC 2014


commit 1c6b97732a0f5df0cb8758db112efb119bedcd01
Author: gil <puntogil at libero.it>
Date:   Thu Jul 3 19:48:14 2014 +0200

    update to 2.4.1

 .gitignore        |    1 +
 LICENSE-2.0.txt   |  202 -----------------------------------------------------
 jackson-core.spec |   27 ++++---
 sources           |    2 +-
 4 files changed, 17 insertions(+), 215 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 5a8060f..d161d1f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /jackson-core-2.2.2.tar.gz
+/jackson-core-2.4.1.tar.gz
diff --git a/jackson-core.spec b/jackson-core.spec
index 4c848c7..66ad436 100644
--- a/jackson-core.spec
+++ b/jackson-core.spec
@@ -1,16 +1,16 @@
 Name:          jackson-core
-Version:       2.2.2
-Release:       5%{?dist}
+Version:       2.4.1
+Release:       1%{?dist}
 Summary:       Core part of Jackson
 License:       ASL 2.0
 URL:           http://wiki.fasterxml.com/JacksonHome
 Source0:       https://github.com/FasterXML/jackson-core/archive/%{name}-%{version}.tar.gz
-# jackson-core package don't include the license file
-# https://github.com/FasterXML/jackson-core/issues/88
-Source1:       http://www.apache.org/licenses/LICENSE-2.0.txt
 
-BuildRequires: java-devel
-BuildRequires: mvn(com.fasterxml:oss-parent) >= 10
+%if %{?fedora} > 20
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent:pom:)
+%else
+BuildRequires: mvn(com.fasterxml.jackson:jackson-parent)
+%endif
 
 # test deps
 BuildRequires: mvn(junit:junit)
@@ -41,7 +41,6 @@ This package contains javadoc for %{name}.
 %prep
 %setup -q -n %{name}-%{name}-%{version}
 
-%pom_xpath_remove "pom:build/pom:extensions"
 # remove unavailable com.google.doclava doclava 1.0.3
 %pom_xpath_remove "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']/pom:configuration"
 %pom_xpath_inject "pom:reporting/pom:plugins/pom:plugin[pom:artifactId='maven-javadoc-plugin']" '
@@ -51,8 +50,9 @@ This package contains javadoc for %{name}.
   <source>${javac.src.version}</source>
 </configuration>'
 
-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
 %mvn_file : %{name}
@@ -62,12 +62,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 release-notes/*
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE-2.0.txt
+%doc LICENSE NOTICE
 
 %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
 
diff --git a/sources b/sources
index 19a9b90..c28cf1a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-421c8cb78ffedbe6e7a5a353a2f67cda  jackson-core-2.2.2.tar.gz
+81fb7dcf78ae17ebe326990ba55faa1e  jackson-core-2.4.1.tar.gz


More information about the scm-commits mailing list