[rpms/google-gson] epel10: Update to 2.2.1

[rpms/google-gson] epel10: Update to 2.2.1

[Krzysztof Daniel]

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : 19f0972b2d3d39c4594467215709c1c9039444f0
Author : Krzysztof Daniel <kdaniel@redhat.com>
Date   : 2012-07-02T17:13:20+03:00
Stats  : +7/-91 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/19f0972b2d3d39c4594467215709c1c9039444f0?branch=epel10

Log:
Update to 2.2.1

---
diff --git a/.gitignore b/.gitignore
index 72bd54e..4209d99 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /google-gson-1.7.1.tar.xz
+google-gson-2.2.1.tar.xz

diff --git a/google-gson-test-fails-workaround.patch b/google-gson-test-fails-workaround.patch
deleted file mode 100644
index 5d7861e..0000000
--- a/google-gson-test-fails-workaround.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-diff -Naur google-gson-1.7.1.old/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java google-gson-1.7.1/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java
---- google-gson-1.7.1.old/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java	2011-03-29 23:36:19.000000000 +0200
-+++ google-gson-1.7.1/src/test/java/com/google/gson/functional/DefaultTypeAdaptersTest.java	2011-05-10 13:46:28.995398504 +0200
-@@ -211,14 +211,17 @@
-   public void testDefaultDateSerialization() {
-     Date now = new Date();
-     String json = gson.toJson(now);
--    assertEquals("\"" + DateFormat.getDateTimeInstance().format(now) + "\"", json);
-+// WORKAROUND FOR : null expected:<"May 10, 2011 1[]:50:32 AM"> but was:<"May 10, 2011 1[0]:50:32 AM">
-+//    assertEquals("\"" + DateFormat.getDateTimeInstance().format(now) + "\"", json);
-   }
- 
-   public void testDefaultDateDeserialization() {
-     String json = "'Dec 13, 2009 07:18:02 AM'";
-     Date extracted = gson.fromJson(json, Date.class);
--    assertEqualsDate(extracted, 2009, 11, 13);
--    assertEqualsTime(extracted, 7, 18, 02);
-+// WORKAROUND FOR : expected:<13> but was:<12>
-+//    assertEqualsDate(extracted, 2009, 11, 13);
-+// WORKAROUND FOR : expected:<7> but was:<22>
-+//    assertEqualsTime(extracted, 7, 18, 02);
-   }
- 
-   // Date can not directly be compared with another instance since the deserialization loses the
-@@ -240,45 +243,53 @@
-   public void testDefaultJavaSqlDateSerialization() {
-     java.sql.Date instant = new java.sql.Date(1259875082000L);
-     String json = gson.toJson(instant);
--    assertEquals("\"Dec 3, 2009\"", json);
-+// WORKAROUND FOR : expected:<3> but was:<2>
-+//    assertEquals("\"Dec 3, 2009\"", json);
-   }
- 
-   public void testDefaultJavaSqlDateDeserialization() {
-     String json = "'Dec 3, 2009'";
-     java.sql.Date extracted = gson.fromJson(json, java.sql.Date.class);
--    assertEqualsDate(extracted, 2009, 11, 3);
-+// WORKAROUND FOR : expected:<3> but was:<2>
-+//    assertEqualsDate(extracted, 2009, 11, 3);
-   }
- 
-   public void testDefaultJavaSqlTimestampSerialization() {
-     Timestamp now = new java.sql.Timestamp(1259875082000L);
-     String json = gson.toJson(now);
--    assertEquals("\"Dec 3, 2009 1:18:02 PM\"", json);
-+// WORKAROUND FOR : null expected:<"Dec 3, 2009 1[]:18:02 PM"> but was:<"Dec 3, 2009 1[0]:18:02 PM">
-+//    assertEquals("\"Dec 3, 2009 1:18:02 PM\"", json);
-   }
- 
-   public void testDefaultJavaSqlTimestampDeserialization() {
-     String json = "'Dec 3, 2009 1:18:02 PM'";
-     Timestamp extracted = gson.fromJson(json, Timestamp.class);
--    assertEqualsDate(extracted, 2009, 11, 3);
--    assertEqualsTime(extracted, 13, 18, 02);
-+// WORKAROUND FOR : expected:<13> but was:<4>
-+//    assertEqualsDate(extracted, 2009, 11, 3);
-+// WORKAROUND FOR : expected:<13> but was:<4>
-+//    assertEqualsTime(extracted, 13, 18, 02);
-   }
- 
-   public void testDefaultJavaSqlTimeSerialization() {
-     Time now = new Time(1259875082000L);
-     String json = gson.toJson(now);
--    assertEquals("\"01:18:02 PM\"", json);
-+// WORKAROUND FOR : null expected:<"[01]:18:02 PM"> but was:<"[10]:18:02 PM">
-+//    assertEquals("\"01:18:02 PM\"", json);
-   }
- 
-   public void testDefaultJavaSqlTimeDeserialization() {
-     String json = "'1:18:02 PM'";
-     Time extracted = gson.fromJson(json, Time.class);
--    assertEqualsTime(extracted, 13, 18, 02);
-+// WORKAROUND FOR : expected:<13> but was:<4>
-+//    assertEqualsTime(extracted, 13, 18, 02);
-   }
- 
-   public void testDefaultDateSerializationUsingBuilder() throws Exception {
-     Gson gson = new GsonBuilder().create();
-     Date now = new Date();
-     String json = gson.toJson(now);
--    assertEquals("\"" + DateFormat.getDateTimeInstance().format(now) + "\"", json);
-+// WORKAROUND FOR : null expected:<"May 10, 2011 [3:35:59 A]M"> but was:<"May 10, 2011 [12:35:59 P]M">
-+//    assertEquals("\"" + DateFormat.getDateTimeInstance().format(now) + "\"", json);
-   }
- 
-   public void testDefaultDateDeserializationUsingBuilder() throws Exception {

diff --git a/google-gson.spec b/google-gson.spec
index 17fb229..7a25907 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -3,8 +3,8 @@
 %global group_id     com.google.code.gson
 
 Name:             google-%{short_name}
-Version:          1.7.1
-Release:          4%{?dist}
+Version:          2.2.1
+Release:          1%{?dist}
 Summary:          Java lib for conversion of Java objects into JSON representation
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -14,7 +14,6 @@ URL:              http://code.google.com/p/%{name}
 # tar caf google-gson-1.7.1.tar.xz google-gson-1.7.1
 Source0:          %{name}-%{version}.tar.xz
 
-Patch0:           %{name}-test-fails-workaround.patch
 Patch1:           %{name}-test-fails-workaround-2.patch
 
 BuildArch:        noarch
@@ -46,7 +45,6 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 
-%patch0 -p1
 %patch1 -p1
 
 # convert CR+LF to LF
@@ -87,6 +85,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
 %doc %{_javadocdir}/%{name}
 
 %changelog
+* Mon Jul 2 2012 Krzysztof Daniel <kdaniel@redhat.com> 2.2.1-1
+- Update to latest upstream 2.2.1
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.7.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 

diff --git a/sources b/sources
index ec03d8e..df85992 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2509472a035e5ff3d00383efe5f9f13d  google-gson-1.7.1.tar.xz
+f67b5f6cdea4650f098903a22aea7162  google-gson-2.2.1.tar.xz