[istack-commons/f19] final set of fixes

[Tom Callaway]

commit 4cde9b1a2199e42cd0c02701e5cc448e88335757
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Fri May 17 09:58:38 2013 -0400

    final set of fixes

 istack-commons.spec |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)
---
diff --git a/istack-commons.spec b/istack-commons.spec
index 090c298..b28e353 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -15,15 +15,19 @@ BuildArch:      noarch
 
 BuildRequires:  ant
 BuildRequires:  ant-junit
+BuildRequires:  args4j
 BuildRequires:  bea-stax-api
 BuildRequires:  codemodel >= 2.6-4
+BuildRequires:  cobertura-maven-plugin
 BuildRequires:  dom4j
 BuildRequires:  java-devel
 BuildRequires:  jpackage-utils
 BuildRequires:  jvnet-parent
 BuildRequires:  junit
 BuildRequires:  maven-local
+BuildRequires:  maven-clean-plugin
 BuildRequires:  maven-compiler-plugin
+BuildRequires:  maven-dependency-plugin
 BuildRequires:  maven-enforcer-plugin
 BuildRequires:  maven-install-plugin
 BuildRequires:  maven-jar-plugin
@@ -75,8 +79,11 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
-rm -rf test/lib/*.zip
+rm -rf test/lib/*.zip runtime/lib/*.zip
 
+%pom_remove_plugin org.glassfish.copyright:glassfish-copyright-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:findbugs-maven-plugin
+%pom_remove_plugin org.codehaus.mojo:buildnumber-maven-plugin
 
 %build
 
@@ -103,6 +110,7 @@ cp -p tools/target/istack-commons-tools-%{version}.jar %{buildroot}%{_javadir}/%
 cp -p test/target/istack-commons-test-%{version}.jar %{buildroot}%{_javadir}/%{name}-test.jar
 cp -p buildtools/target/%{name}-buildtools-%{version}.jar %{buildroot}%{_javadir}/%{name}-buildtools.jar
 cp -p maven-plugin/target/%{name}-maven-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}-maven-plugin.jar
+cp -p soimp/target/%{name}-soimp-%{version}.jar %{buildroot}%{_javadir}/%{name}-soimp.jar
 
 # JAVADOC
 cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
@@ -114,6 +122,7 @@ cp -p tools/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-tools.pom
 cp -p test/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-test.pom
 cp -p buildtools/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-buildtools.pom
 cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-maven-plugin.pom
+cp -p soimp/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-soimp.pom
 
 # DEPMAP
 %add_maven_depmap JPP-%{name}.pom
@@ -122,6 +131,7 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-maven-plugin.
 %add_maven_depmap JPP-%{name}-test.pom %{name}-test.jar
 %add_maven_depmap JPP-%{name}-buildtools.pom %{name}-buildtools.jar
 %add_maven_depmap JPP-%{name}-maven-plugin.pom %{name}-maven-plugin.jar -f maven-plugin
+%add_maven_depmap JPP-%{name}-soimp.pom %{name}-soimp.jar
 
 %files
 %{_mavenpomdir}/JPP-%{name}-runtime.pom
@@ -129,9 +139,11 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-maven-plugin.
 %{_mavenpomdir}/JPP-%{name}-tools.pom
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavenpomdir}/JPP-%{name}-buildtools.pom
+%{_mavenpomdir}/JPP-%{name}-soimp.pom
 %{_mavendepmapfragdir}/%{name}
 %{_javadir}/%{name}-buildtools.jar
 %{_javadir}/%{name}-runtime.jar
+%{_javadir}/%{name}-soimp.jar
 %{_javadir}/%{name}-test.jar
 %{_javadir}/%{name}-tools.jar
 %doc Licence.txt