[stax-ex] rebuilt FTBFS in rawhide

[gil]

commit af8677179f2cc833c30db30409354af21a2de77d
Author: gil <puntogil at libero.it>
Date:   Mon Aug 5 17:51:00 2013 +0200

    rebuilt FTBFS in rawhide

 stax-ex.spec |   71 ++++++++++++++++-----------------------------------------
 1 files changed, 20 insertions(+), 51 deletions(-)
---
diff --git a/stax-ex.spec b/stax-ex.spec
index 9e5a464..26dc878 100644
--- a/stax-ex.spec
+++ b/stax-ex.spec
@@ -1,30 +1,22 @@
-Name: stax-ex
-Version: 1.7.1
-Release: 5%{?dist}
-Summary: StAX API extensions
-Group: Development/Libraries
-License: CDDL or GPLv2
-Url: https://stax-ex.dev.java.net
-
+Name:          stax-ex
+Version:       1.7.1
+Release:       6%{?dist}
+Summary:       StAX API extensions
+License:       CDDL or GPLv2
+Url:           https://stax-ex.dev.java.net
 # svn export https://svn.java.net/svn/stax-ex~svn/tags/stax-ex-1.7.1 stax-ex-1.7.1
 # find stax-ex-1.7.1/ -name '*.jar' -delete
 # tar czf stax-ex-1.7.1.tar.gz stax-ex-1.7.1
-Source0: %{name}-%{version}.tar.gz
+Source0:       %{name}-%{version}.tar.gz
 
 BuildRequires: bea-stax
 BuildRequires: dos2unix
 BuildRequires: java-devel
-BuildRequires: jpackage-utils
 BuildRequires: junit
 BuildRequires: jvnet-parent
 BuildRequires: maven-local
 BuildRequires: maven-enforcer-plugin
-
-Requires: bea-stax
-Requires: jpackage-utils
-
-BuildArch: noarch
-
+BuildArch:     noarch
 
 %description
 This project develops a few extensions to complement JSR-173 StAX API in the
@@ -36,19 +28,15 @@ following area.
   such as FastInfoset.
 * Improve the namespace support.
 
-
 %package javadoc
-Group: Documentation
-Summary: Javadoc for %{name}
-Requires: jpackage-utils
-
+Summary:       Javadoc for %{name}
 
 %description javadoc
 This package contains javadoc for %{name}.
 
-
 %prep
 %setup -q
+
 %pom_remove_dep javax.activation:activation
 
 # Convert the license to UTF-8:
@@ -56,45 +44,26 @@ mv LICENSE.txt LICENSE.txt.tmp
 iconv -f ISO-8859-1 -t UTF-8 LICENSE.txt.tmp > LICENSE.txt
 dos2unix LICENSE.txt
 
-
 %build
-mvn-rpmbuild \
-  -Dproject.build.sourceEncoding=UTF-8 \
-  install \
-  javadoc:aggregate
 
+%mvn_file :stax-ex %{name}
+%mvn_build -- -Dproject.build.sourceEncoding=UTF-8
 
 %install
+%mvn_install
 
-# Jar files:
-install -d -m 755 %{buildroot}%{_javadir}
-install -m 644 target/stax-ex-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
-
-# POM files:
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-cp -p pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# Javadoc files:
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-# Dependencies map:
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-%files
-%{_javadir}/*
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
+%files -f .mfiles
 %doc LICENSE.txt
 
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
 
-
 %changelog
+* Mon Aug 05 2013 gil cattaneo <puntogil at libero.it> 1.7.1-6
+- rebuilt FTBFS in rawhide
+- swith to Xmvn
+- adapt to new guideline
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild