[joda-time] Update to latest upstream and tzdata

[Stanislav Ochotnicky]

commit 4cc5e0e76aba480fc86486392084b5b33e17db90
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Wed Jun 5 10:29:59 2013 +0200

    Update to latest upstream and tzdata
    
    - Install NOTICE.txt

 .gitignore     |    2 ++
 joda-time.spec |   21 +++++++++++----------
 sources        |    4 ++--
 3 files changed, 15 insertions(+), 12 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index ea2e93b..919b4b3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ tzdata2008i.tar.gz
 /joda-time-2.1-dist.tar.gz
 /tzdata2012g.tar.gz
 /tzdata2012h.tar.gz
+/tzdata2013c.tar.gz
+/joda-time-2.2-dist.tar.gz
diff --git a/joda-time.spec b/joda-time.spec
index c29da47..6da62ce 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -1,8 +1,8 @@
-%global tzversion tzdata2012h
+%global tzversion tzdata2013c
 
 Name:             joda-time
-Version:          2.1
-Release:          5.%{tzversion}%{?dist}
+Version:          2.2
+Release:          1.%{tzversion}%{?dist}
 Summary:          Java date and time API
 
 License:          ASL 2.0
@@ -14,6 +14,7 @@ BuildArch:        noarch
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    maven-local
 BuildRequires:    joda-convert
+BuildRequires:    exec-maven-plugin
 
 
 %description
@@ -35,8 +36,8 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q -n %{name}-%{version}
 sed -i 's/\r//' LICENSE.txt
+sed -i 's/\r//' NOTICE.txt
 sed -i 's/\r//' RELEASE-NOTES.txt
-sed -i 's/\r//' ToDo.txt
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
@@ -48,10 +49,6 @@ tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
 # compat filename
 %mvn_file : %{name}
 
-# test failing on koji
-sed -i '/testSetInto_Object/,/}/ {d}' \
-    src/test/java/org/joda/time/convert/TestReadableDurationConverter.java
-
 %build
 %mvn_build
 
@@ -59,12 +56,16 @@ sed -i '/testSetInto_Object/,/}/ {d}' \
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE.txt RELEASE-NOTES.txt ToDo.txt
+%doc LICENSE.txt RELEASE-NOTES.txt NOTICE.txt
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE.txt
+%doc LICENSE.txt NOTICE.txt
 
 %changelog
+* Wed Jun  5 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.2-1.tzdata2013c
+- Update to latest upstream and tzdata
+- Install NOTICE.txt
+
 * Tue Jun  4 2013 Stanislav Ochotnicky <sochotnicky at redhat.com> - 2.1-5.tzdata2012h
 - Enable testsuite
 - Update to lates packaging guidelines
diff --git a/sources b/sources
index 9ec1b00..7f2baa7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-3d4017b2945d885bb1e658fca00e46a5  joda-time-2.1-dist.tar.gz
-b937335e087fb85b7f8e3ce33e69184b  tzdata2012h.tar.gz
+b5062217a2dea6823dd69b4dda97b249  tzdata2013c.tar.gz
+fbe59dd0349deeffd3bf27942c1f55b6  joda-time-2.2-dist.tar.gz