From e114eea2a0315df72f8d8153a984d28b26532961 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Sat, 6 Jul 2013 19:20:04 +0200
Subject: [PATCH] switch to XMvn

---
 android-opengl-api.spec | 42 ++++++++++-------------------------------
 1 file changed, 10 insertions(+), 32 deletions(-)

diff --git a/android-opengl-api.spec b/android-opengl-api.spec
index ea10b0b..9520e7d 100644
--- a/android-opengl-api.spec
+++ b/android-opengl-api.spec
@@ -1,9 +1,8 @@
 %global namedversion gl%{version}-android-2.1_r1
 Name:          android-opengl-api
 Version:       1.1
-Release:       5%{?dist}
+Release:       6%{?dist}
 Summary:       Google Android Java ME Library (Khronos)
-Group:         Development/Libraries
 License:       ASL 2.0
 # While the EULA for the Android SDK restricts distribution of those binaries, the source code 
 # is licensed under Apache 2.0 which allows compiling binaries from source and then distributing
@@ -16,18 +15,7 @@ Source1:       http://repo1.maven.org/maven2/org/khronos/opengl-api/%{namedversi
 Source2:       http://www.apache.org/licenses/LICENSE-2.0.txt
 
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
-
 BuildRequires: maven-local
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-surefire-plugin
-
-Requires:      java
-Requires:      jpackage-utils
 BuildArch:     noarch
 
 %description
@@ -35,9 +23,7 @@ The Android implementation of Khronos OpenGL Spec
 for the Google Android SDK.
 
 %package javadoc
-Group:         Documentation
 Summary:       Javadoc for %{name}
-Requires:      jpackage-utils
 
 %description javadoc
 This package contains javadoc for %{name}.
@@ -59,31 +45,23 @@ sed -i 's/\r//' LICENSE-2.0.txt
 
 %build
 
-mvn-rpmbuild -Dproject.build.sourceEncoding=UTF-8 install javadoc:aggregate
+%mvn_file :opengl-api opengl-api
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
+%mvn_install
 
-mkdir -p %{buildroot}%{_javadir}
-install -m 644 target/opengl-api-%{namedversion}.jar %{buildroot}%{_javadir}/opengl-api.jar
-
-mkdir -p %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-opengl-api.pom
-%add_maven_depmap JPP-opengl-api.pom opengl-api.jar
-
-mkdir -p %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%files
-%{_javadir}/opengl-api.jar
-%{_mavenpomdir}/JPP-opengl-api.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 %doc LICENSE-2.0.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE-2.0.txt
 
 %changelog
+* Sat Jul 06 2013 gil cattaneo <puntogil@libero.it> 1.1-6
+- switch to XMvn
+- minor changes to adapt to current guideline
+
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild