[rpms/google-gson] epel10: Move to xmvn style packaging and fix FTBFS.

[rpms/google-gson] epel10: Move to xmvn style packaging and fix FTBFS.

[Severin Gehwolf]

            A new commit has been pushed.

            Repo   : rpms/google-gson
            Branch : epel10
            Commit : 46e017a513282e5286db43ade433cc2cf65b7c2a
            Author : Severin Gehwolf <sgehwolf@redhat.com>
            Date   : 2014-06-10T12:22:38+02:00
            Stats  : +9/-20 in 1 file(s)
            URL    : https://src.fedoraproject.org/rpms/google-gson/c/46e017a513282e5286db43ade433cc2cf65b7c2a?branch=epel10

            Log:
            Move to xmvn style packaging and fix FTBFS.

Resolves RHBZ#1106707.

---
diff --git a/google-gson.spec b/google-gson.spec
index 5e65f39..15bf86f 100644
--- a/google-gson.spec
+++ b/google-gson.spec
@@ -4,7 +4,7 @@
 
 Name:             google-%{short_name}
 Version:          2.2.4
-Release:          5%{?dist}
+Release:          6%{?dist}
 Summary:          Java lib for conversion of Java objects into JSON representation
 License:          ASL 2.0
 Group:            Development/Libraries
@@ -48,33 +48,22 @@ sed -i 's/\r//g' LICENSE
 
 %build
 # LANG="C" or LANG="en_US.utf8" needed for the tests
-mvn-rpmbuild -Dmaven.test.failure.ignore=true install 
+%mvn_build -- -Dmaven.test.failure.ignore=true
 
 %install
-# jars
-install -d -m 755 %{buildroot}%{_javadir}
-install -p -m 644 target/%{short_name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_install
 
-# pom
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
+%files -f .mfiles
 %doc LICENSE README
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE
-%doc %{_javadocdir}/%{name}
 
 %changelog
+* Tue Jun 10 2014 Severin Gehwolf <sgehwolf@redhat.com> - 2.2.4-6
+- Move to xmvn style packaging.
+- Fix FTBFS. Resolves RHBZ#1106707.
+
 * Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 2.2.4-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild