[jbossxb] Update to use new pom_* macros

[Gerard Ryan]

commit 4d79782d1f440fe82bb592dc66d7c00e22f5ca26
Author: Gerard Ryan <gerard at ryan.lt>
Date:   Sat Jul 5 20:57:11 2014 +0100

    Update to use new pom_* macros

 jbossxb-pom.patch |   92 -----------------------------------------------------
 jbossxb.spec      |   57 +++++++++++----------------------
 2 files changed, 19 insertions(+), 130 deletions(-)
---
diff --git a/jbossxb.spec b/jbossxb.spec
index 8f14ca9..63b484d 100644
--- a/jbossxb.spec
+++ b/jbossxb.spec
@@ -1,17 +1,14 @@
 Name:           jbossxb
 Version:        2.0.3
-Release:        6%{?dist}
+Release:        7%{?dist}
 Summary:        JBoss XML Binding
 
-Group:          Development/Libraries
-
 License:        LGPLv2+
 URL:            http://www.jboss.org
 
 # svn export http://anonsvn.jboss.org/repos/common/jbossxb/tags/2.0.3.GA/ jbossxb-2.0.3
 # tar cJf jbossxb-2.0.3.tar.xz jbossxb-2.0.3/
 Source0:        %{name}-%{version}.tar.xz
-Patch0:         %{name}-pom.patch
 
 BuildArch:      noarch
 
@@ -19,6 +16,7 @@ BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 
 BuildRequires:  bea-stax
+BuildRequires:  dtdparser
 BuildRequires:  javassist
 BuildRequires:  jboss-classpool-scoped
 BuildRequires:  jboss-common-core
@@ -33,17 +31,9 @@ BuildRequires:  maven-javadoc-plugin
 BuildRequires:  maven-resources-plugin
 BuildRequires:  maven-source-plugin
 BuildRequires:  maven-surefire-plugin
-BuildRequires:  maven-surefire-provider-junit4
+BuildRequires:  maven-surefire-provider-junit
 BuildRequires:  xerces-j2
-
-Requires:       bea-stax
-Requires:       javassist
-Requires:       jboss-classpool-scoped
-Requires:       jboss-common-core
-Requires:       jboss-logging
-Requires:       jboss-reflect
-Requires:       jpackage-utils
-Requires:       xerces-j2
+BuildRequires:  xml-commons-apis
 
 %description
 JBoss XML Binding.
@@ -59,42 +49,33 @@ This package contains the API documentation for %{name}.
 %prep
 %setup -q
 
-# can't compile stuff in the test dir...missing deps
+# can't compile stuff in the test dir...missing deps: jboss-test
 rm -rf src/test
 
 find -type f -name *.jar -delete
 find -type f -name *.class -delete
 
-%patch0
+%pom_change_dep org.jboss.logging:jboss-logging-spi org.jboss.logging:jboss-logging
+%pom_add_dep stax:stax
+%pom_add_dep org.jboss.spec.javax.xml.bind:jboss-jaxb-api_2.2_spec
+%pom_remove_dep sun-jaxb:jaxb-api
+%pom_remove_dep javax.activation:activation
+%pom_remove_dep org.jboss.test:jboss-test
 
 %build
-mvn-rpmbuild package javadoc:aggregate
+%{mvn_build}
 
 %install
+%mvn_install -J target/site/apidocs/
 
-# jar is named jboss-xml-binding.jar by default; Renamed to jbossxb.jar.
-mkdir -p $RPM_BUILD_ROOT%{_javadir}
-cp -p target/jboss-xml-binding.jar $RPM_BUILD_ROOT%{_javadir}/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
-
-%add_maven_depmap JPP-%{name}.pom %{name}.jar
-
-
-%files
-%{_mavenpomdir}/JPP-%{name}.pom
-%{_mavendepmapfragdir}/%{name}
-%{_javadir}/%{name}.jar
-
-%files javadoc
-%{_javadocdir}/%{name}
+%files -f .mfiles
+%files javadoc -f .mfiles-javadoc
 
 
 %changelog
+* Sat Jul 05 2014 Gerard Ryan <galileo at fedoraproject.org> - 2.0.3-7
+- Update to use new pom_* macros
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.0.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
@@ -111,5 +92,5 @@ install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-%{name}.pom
 - Update for https://fedoraproject.org/wiki/Fedora_19_Maven_Rebuild
 - Replace maven BuildRequires with maven-local
 
-* Tue Jun 28 2012 Gerard Ryan <galileo at fedoraproject.org> - 2.0.3-1
+* Thu Jun 28 2012 Gerard Ryan <galileo at fedoraproject.org> - 2.0.3-1
 - Initial packaging.