From 84ec555e93882e7a09d5cf23173709ea138e695f Mon Sep 17 00:00:00 2001
From: spike <spike@fedoraproject.org>
Date: Oct 20 2012 07:18:58 +0000
Subject: Updated to 2.1

New tzdata (2012g)
Updated spec file according to latest java packaging guidelines

---

diff --git a/.gitignore b/.gitignore
index fac61c3..f0d1d0b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,5 @@ tzdata2008i.tar.gz
 /tzdata2010l.tar.gz
 /tzdata2010n.tar.gz
 /tzdata2011f.tar.gz
+/joda-time-2.1-dist.tar.gz
+/tzdata2012g.tar.gz
diff --git a/joda-time-remove-toolchains-from-pom.patch b/joda-time-remove-toolchains-from-pom.patch
deleted file mode 100644
index 8e40d73..0000000
--- a/joda-time-remove-toolchains-from-pom.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- pom.xml	2010-09-14 00:39:02.000000000 +0200
-+++ pom.xml	2010-09-23 09:11:42.197087974 +0200
-@@ -153,21 +152,0 @@
--        <groupId>org.apache.maven.plugins</groupId>
--        <artifactId>maven-toolchains-plugin</artifactId>
--        <version>1.0</version>
--        <executions>
--          <execution>
--            <phase>validate</phase>
--            <goals>
--              <goal>toolchain</goal>
--            </goals>
--          </execution>
--        </executions>
--        <configuration>
--          <toolchains>
--            <jdk>
--              <version>1.4</version>
--              <vendor>sun</vendor>
--            </jdk>
--          </toolchains>
--        </configuration>
--      </plugin>
--      <plugin>
diff --git a/joda-time.spec b/joda-time.spec
index a03026e..de96844 100644
--- a/joda-time.spec
+++ b/joda-time.spec
@@ -1,25 +1,25 @@
-%global tzversion tzdata2011f
+%global tzversion tzdata2012g
 
 Name:             joda-time
-Version:          1.6.2
-Release:          8.%{tzversion}%{?dist}
+Version:          2.1
+Release:          1.%{tzversion}%{?dist}
 Summary:          Java date and time API
 
 Group:            Development/Libraries
 License:          ASL 2.0
 URL:              http://joda-time.sourceforge.net
-Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-src.tar.gz
-Source1:          ftp://elsie.nci.nih.gov/pub/%{tzversion}.tar.gz
-# Remove maven toolchanins from pom.xml (not present in fedora yet)
-Patch0:           joda-time-remove-toolchains-from-pom.patch
+Source0:          http://downloads.sourceforge.net/%{name}/%{name}-%{version}-dist.tar.gz
+Source1:          ftp://ftp.iana.org/tz/releases/%{tzversion}.tar.gz
 BuildArch:        noarch
 
 BuildRequires:    java-devel >= 1:1.6.0
 BuildRequires:    jpackage-utils
 BuildRequires:    maven
+BuildRequires:    joda-convert
 
 Requires:         java >= 1:1.6.0
 Requires:         jpackage-utils
+Requires:         joda-convert
 
 %description
 Joda-Time provides a quality replacement for the Java date and time classes. The
@@ -41,15 +41,13 @@ This package contains the API documentation for %{name}.
 
 
 %prep
-%setup -q -n %{name}-%{version}-src
+%setup -q -n %{name}-%{version}
 sed -i 's/\r//' LICENSE.txt
 sed -i 's/\r//' RELEASE-NOTES.txt
 sed -i 's/\r//' ToDo.txt
-%patch0 -p0
 
 # all java binaries must be removed from the sources
 find . -name '*.jar' -exec rm -f '{}' \;
-find . -name '*.class' -exec rm -f '{}' \;
 
 # replace internal tzdata
 rm -f src/main/java/org/joda/time/tz/src/*
@@ -58,7 +56,6 @@ tar -xzf %{SOURCE1} -C src/main/java/org/joda/time/tz/src/
 
 %build
 mvn-rpmbuild \
-        -e \
         -Dmaven.test.failure.ignore=true \
         install javadoc:javadoc
 
@@ -88,6 +85,11 @@ cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}/
 %{_javadocdir}/%{name}
 
 %changelog
+* Sat Oct 20 2012 Chris Spike <spike@fedoraproject.org> 2.1-1.tzdata2012g
+- Updated to 2.1
+- New tzdata (2012g)
+- Updated spec file according to latest java packaging guidelines
+
 * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.6.2-8.tzdata2011f
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
 
diff --git a/sources b/sources
index a9677a1..b6ab653 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-103cb37e0d01c8758bf83d042267409c  joda-time-1.6.2-src.tar.gz
-cc8136284ae1e6c720a18e0f080242e0  tzdata2011f.tar.gz
+3d4017b2945d885bb1e658fca00e46a5  joda-time-2.1-dist.tar.gz
+111cd46b5c2e40b2b37ae707d48aaa50  tzdata2012g.tar.gz