Attachment 666032 Details for Bug 888745 – patch for spec file.

[patch] patch for spec file.

0001-Update-to-latest-upstream-release.patch (text/plain), 4.05 KB, created by Severin Gehwolf on 2012-12-19 11:55:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Severin Gehwolf

Created: 2012-12-19 11:55:58 UTC

Size: 4.05 KB

patch

obsolete

>From 7f4fe70346be9d8a5af0555e6eb55a1a88275d79 Mon Sep 17 00:00:00 2001
>From: Severin Gehwolf <sgehwolf@redhat.com>
>Date: Wed, 19 Dec 2012 12:53:18 +0100
>Subject: [PATCH] Update to latest upstream release.
>
>---
> .gitignore                                |  1 +
> google-gson-test-fails-workaround-2.patch | 21 ---------------------
> google-gson.spec                          | 15 +++++++--------
> sources                                   |  2 +-
> 4 files changed, 9 insertions(+), 30 deletions(-)
> delete mode 100644 google-gson-test-fails-workaround-2.patch
>
>diff --git a/.gitignore b/.gitignore
>index 4209d99..3e00672 100644
>--- a/.gitignore
>+++ b/.gitignore
>@@ -1,2 +1,3 @@
> /google-gson-1.7.1.tar.xz
> google-gson-2.2.1.tar.xz
>+/google-gson-2.2.2.tar.xz
>diff --git a/google-gson-test-fails-workaround-2.patch b/google-gson-test-fails-workaround-2.patch
>deleted file mode 100644
>index a150e30..0000000
>--- a/google-gson-test-fails-workaround-2.patch
>+++ /dev/null
>@@ -1,21 +0,0 @@
>-diff -Naur google-gson-1.7.1.orig/src/test/java/com/google/gson/DefaultInetAddressTypeAdapterTest.java google-gson-1.7.1/src/test/java/com/google/gson/DefaultInetAddressTypeAdapterTest.java
>---- google-gson-1.7.1.orig/src/test/java/com/google/gson/DefaultInetAddressTypeAdapterTest.java	2011-01-11 00:03:48.000000000 +0100
>-+++ google-gson-1.7.1/src/test/java/com/google/gson/DefaultInetAddressTypeAdapterTest.java	2011-05-13 14:48:43.000000000 +0200
>-@@ -35,11 +35,12 @@
>-   }
>-   
>-   public void testInetAddressSerializationAndDeserialization() throws Exception {
>--    InetAddress localhost = InetAddress.getLocalHost();
>--    String localInetAddress = gson.toJson(localhost);
>--    assertEquals("\"" + localhost.getHostAddress() + "\"", localInetAddress);
>-+// WORKAROUND FOR : Tests in error: testInetAddressSerializationAndDeserialization
>-+//    InetAddress localhost = InetAddress.getLocalHost();
>-+//    String localInetAddress = gson.toJson(localhost);
>-+//    assertEquals("\"" + localhost.getHostAddress() + "\"", localInetAddress);
>-     
>--    InetAddress value = gson.fromJson(localInetAddress, InetAddress.class);
>--    assertEquals(localhost, value);
>-+//    InetAddress value = gson.fromJson(localInetAddress, InetAddress.class);
>-+//    assertEquals(localhost, value);
>-   } 
>- }
>diff --git a/google-gson.spec b/google-gson.spec
>index 2ea5813..df81a23 100644
>--- a/google-gson.spec
>+++ b/google-gson.spec
>@@ -3,19 +3,17 @@
> %global group_id     com.google.code.gson
> 
> Name:             google-%{short_name}
>-Version:          2.2.1
>-Release:          3%{?dist}
>+Version:          2.2.2
>+Release:          1%{?dist}
> Summary:          Java lib for conversion of Java objects into JSON representation
> License:          ASL 2.0
> Group:            Development/Libraries
> URL:              http://code.google.com/p/%{name}
> # request for tarball: http://code.google.com/p/google-gson/issues/detail?id=283
>-# svn export http://google-gson.googlecode.com/svn/tags/gson-1.7.1 google-gson-1.7.1
>-# tar caf google-gson-1.7.1.tar.xz google-gson-1.7.1
>+# svn export http://google-gson.googlecode.com/svn/tags/gson-%{version} google-gson-%{version}
>+# tar caf google-gson-%{version}.tar.xz google-gson-%{version}
> Source0:          %{name}-%{version}.tar.xz
> 
>-Patch1:           %{name}-test-fails-workaround-2.patch
>-
> BuildArch:        noarch
> 
> BuildRequires:    java-devel
>@@ -44,8 +42,6 @@ This package contains the API documentation for %{name}.
> %prep
> %setup -q
> 
>-%patch1 -p1
>-
> # convert CR+LF to LF
> sed -i 's/\r//g' LICENSE
> 
>@@ -78,6 +74,9 @@ cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
> %doc %{_javadocdir}/%{name}
> 
> %changelog
>+* Wed Dec 19 2012 Severin Gehwolf <sgehwolf@redhat.com> 2.2.2-1
>+- Update to latest upstream release.
>+
> * Thu Jul 19 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.1-3
> - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
> 
>diff --git a/sources b/sources
>index df85992..bbc9ccc 100644
>--- a/sources
>+++ b/sources
>@@ -1 +1 @@
>-f67b5f6cdea4650f098903a22aea7162  google-gson-2.2.1.tar.xz
>+dcba1470e2354767b2f87cc65fb964d3  google-gson-2.2.2.tar.xz
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 888745: 666032