From 8405b7f46e5af4951bb274e5652c38b8b2bd2ea1 Mon Sep 17 00:00:00 2001
From: gil <puntogil@libero.it>
Date: Aug 13 2013 10:12:29 +0000
Subject: fix rhbz#993381


Signed-off-by: Mikolaj Izdebski <mizdebsk@redhat.com>

---

diff --git a/stax2-api.spec b/stax2-api.spec
index 206b7b5..850ff5a 100644
--- a/stax2-api.spec
+++ b/stax2-api.spec
@@ -1,12 +1,11 @@
 Name:             stax2-api
 Version:          3.1.1
-Release:          7%{?dist}
+Release:          8%{?dist}
 Summary:          Experimental API extending basic StAX implementation
 License:          BSD
-Group:            Development/Libraries
-
+# NOTE. new home http://wiki.fasterxml.com/WoodstoxStax2
 URL:              http://docs.codehaus.org/display/WSTX/StAX2
-
+# NOTE. newer release available here https://github.com/FasterXML/stax2-api/
 Source0:          http://repository.codehaus.org/org/codehaus/woodstox/%{name}/%{version}/%{name}-%{version}-sources.jar
 Source1:          http://repository.codehaus.org/org/codehaus/woodstox/%{name}/%{version}/%{name}-%{version}.pom
 
@@ -16,11 +15,6 @@ BuildRequires:    maven-surefire-provider-junit
 BuildRequires:    bea-stax-api
 BuildRequires:    java-devel
 BuildRequires:    maven-local
-BuildRequires:    jpackage-utils
-
-Requires:         bea-stax-api
-Requires:         jpackage-utils
-Requires:         java
 
 %description
 StAX2 is an experimental API that is intended to extend
@@ -30,11 +24,8 @@ StAX specification (if they do). As such, it is intended
 to be freely implementable by all StAX implementations same way
 as StAX, but without going through a formal JCP process.
 
-
 %package javadoc
 Summary:          API documentation for %{name}
-Group:            Documentation
-Requires:         jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
@@ -46,32 +37,26 @@ mkdir -p src/main/java
 mv -f org src/main/java/
 
 cp %{SOURCE1} pom.xml
+%pom_remove_dep javax.xml.stream:stax-api
+%pom_add_dep stax:stax-api:1.0.1
 
 %build
-mvn-rpmbuild install javadoc:aggregate
 
-%install
-# jars
-install -Dpm 644 target/%{name}-%{version}.jar %{buildroot}%{_javadir}/%{name}.jar
+%mvn_file :%{name} %{name}
+%mvn_build
 
-# pom
-install -Dpm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
-
-# javadoc
-install -d -m 755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
+%install
+%mvn_install
 
-%files
-%{_javadir}/%{name}.jar
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
+%files -f .mfiles
 
-%files javadoc
-%doc %{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 
 %changelog
+* Mon Aug 12 2013 gil cattaneo <puntogil@libero.it> 3.1.1-8
+- fix rhbz#993381
+- update to current packaging guidelines
+
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.1.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild