[rpms/google-gson] epel10: Update to latest upstream release

[rpms/google-gson] epel10: Update to latest upstream release

[Mat Booth]

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : 3055bcfeaa30dbb76a386321de028e41dc1c9015
Author : Mat Booth <mat.booth@redhat.com>
Date   : 2017-08-25T10:28:24+01:00
Stats  : +33/-32 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/3055bcfeaa30dbb76a386321de028e41dc1c9015?branch=epel10

Log:
Update to latest upstream release

---
diff --git a/.gitignore b/.gitignore
index aba50e5..40f94ef 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ google-gson-2.2.1.tar.xz
 /google-gson-2.2.2.tar.xz
 /google-gson-2.2.4.tar.xz
 /gson-2.3.1.tar.gz
+/gson-parent-2.8.1.tar.gz

diff --git a/google-gson.spec b/google-gson.spec
index 5c1a4a7..ceabd71 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -1,16 +1,16 @@
-Name:             google-gson
-Version:          2.3.1
-Release:          7%{?dist}
-Summary:          Java lib for conversion of Java objects into JSON representation
-License:          ASL 2.0
-URL:              https://github.com/google/gson
-Source0:          https://github.com/google/gson/archive/gson-%{version}.tar.gz
+Name:           google-gson
+Version:        2.8.1
+Release:        1%{?dist}
+Summary:        Java lib for conversion of Java objects into JSON representation
+License:        ASL 2.0
+URL:            https://github.com/google/gson
+Source0:        https://github.com/google/gson/archive/gson-parent-%{version}.tar.gz
 
-BuildArch:        noarch
+BuildArch:      noarch
 
 BuildRequires:  maven-local
 BuildRequires:  mvn(junit:junit)
-BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.apache.felix:maven-bundle-plugin)
 BuildRequires:  mvn(org.sonatype.oss:oss-parent:pom:)
 
 %description
@@ -20,46 +20,46 @@ equivalent Java object. Gson can work with arbitrary Java objects including
 pre-existing objects that you do not have source-code of.
 
 %package javadoc
-Summary:          API documentation for %{name}
+Summary:        API documentation for %{name}
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n gson-gson-%{version}
-
-# convert CR+LF to LF
-sed -i 's/\r//g' LICENSE
-
-# Test requires network
-rm src/test/java/com/google/gson/DefaultInetAddressTypeAdapterTest.java
-
-# Throwable has more fields serialized, probably incorrect test expectations
-rm src/test/java/com/google/gson/functional/ThrowableFunctionalTest.java
-
-# Fixes build with new maven-jar-plugin
-%pom_xpath_inject "pom:plugin[pom:artifactId='maven-jar-plugin']/pom:executions" "
+%setup -q -n gson-gson-parent-%{version}
+
+# Use felix maven-bundle-plugin only for OSGi metadata
+%pom_remove_plugin :bnd-maven-plugin gson
+%pom_xpath_inject "pom:plugin[pom:artifactId='maven-bundle-plugin']" "<configuration>
+    <instructions>
+      <_include>bnd.bnd</_include>
+    </instructions>
+  </configuration>
+  <executions>
     <execution>
-      <id>default-jar</id>
-      <phase>skip</phase>
-    </execution>"
-
-%pom_remove_plugin :maven-javadoc-plugin
+      <id>create-manifest</id>
+      <phase>process-classes</phase>
+      <goals><goal>manifest</goal></goals>
+    </execution>
+  </executions>" gson
 
 %build
-# LANG="C" or LANG="en_US.utf8" needed for the tests
 %mvn_build
 
 %install
 %mvn_install
 
 %files -f .mfiles
-%doc LICENSE README
+%license LICENSE
+%doc README.md CHANGELOG.md UserGuide.md
 
 %files javadoc -f .mfiles-javadoc
-%doc LICENSE
+%license LICENSE
 
 %changelog
+* Fri Aug 25 2017 Mat Booth <mat.booth@redhat.com> - 2.8.1-1
+- Update to latest upstream release
+
 * Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 2.3.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
 

diff --git a/sources b/sources
index 435f88d..9b954d2 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-2353062b18128ce321aff687479a52b3  gson-2.3.1.tar.gz
+SHA512 (gson-parent-2.8.1.tar.gz) = c243a76dfed0f16a519bbfc120002c07710a191736033f74316ac4c84134e279b7a6bb26a4c129fe6237503842be446556ee4b2e7d7fde5a0c045e11808f2008

[rpms/google-gson] epel10: Update to latest upstream release.

[Severin Gehwolf]

A new commit has been pushed.

Repo   : rpms/google-gson
Branch : epel10
Commit : 7f4fe70346be9d8a5af0555e6eb55a1a88275d79
Author : Severin Gehwolf <sgehwolf@redhat.com>
Date   : 2012-12-19T12:53:18+01:00
Stats  : +9/-30 in 4 file(s)
URL    : https://src.fedoraproject.org/rpms/google-gson/c/7f4fe70346be9d8a5af0555e6eb55a1a88275d79?branch=epel10

Log:
Update to latest upstream release.

---
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