[maven-scm] Remove -client-with-dependencies jar to get rid of duplicate libraries

[Guido Grazioli]

commit 61130b2ae53e1ad6fd07d0bbb4de081598c07973
Author: Guido Grazioli <guido.grazioli at gmail.com>
Date:   Mon Apr 23 16:03:47 2012 +1000

    Remove -client-with-dependencies jar to get rid of duplicate libraries
    
    - Switch off maven execution debug output

 maven-scm.spec |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/maven-scm.spec b/maven-scm.spec
index 70d3d59..ccae8f9 100644
--- a/maven-scm.spec
+++ b/maven-scm.spec
@@ -30,7 +30,7 @@
 
 Name:           maven-scm
 Version:        1.6
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Common API for doing SCM operations
 License:        ASL 2.0
 Group:          Development/Libraries
@@ -120,7 +120,7 @@ find maven-scm-providers/maven-scm-provider-accurev/src/test/java/org/apache/mav
 
 %build
 
-mvn-rpmbuild -X\
+mvn-rpmbuild \
         -Dmaven.test.skip=true \
         -Dmaven.local.depmap.file=%{SOURCE1} \
         install javadoc:aggregate
@@ -137,7 +137,10 @@ for jar in `find . -type f -name "*.jar" | grep -E "target/.*.jar$"`; do
         install -pm 644 $jar $RPM_BUILD_ROOT%{_javadir}/%{name}/$versionless_jar
 done
 
-#poms (exclude the svn/cvstest poms. They are unnecessary)
+#remove maven-scm CLI jar-with-dependencies created by maven-assembly-plugin
+rm $RPM_BUILD_ROOT%{_javadir}/%{name}/client-jar-with-dependencies.jar
+
+#poms (exclude the svn/cvs test poms. They are unnecessary)
 # ignore
 #  1) poms in target/ (they are either copies, or temps)
 #  2) poms in src/test/ (they are poms needed for tests only)
@@ -156,6 +159,8 @@ cp -p pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.maven-scm-scm.pom
 # javadoc
 install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
+# we dont want this distributed
+rm $RPM_BUILD_ROOT%{_javadocdir}/%{name}/javadoc.sh
 
 %files
 %dir %{_javadir}/%{name}
@@ -176,6 +181,10 @@ cp -pr target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_javadocdir}/*
 
 %changelog
+* Mon Apr 23 2012 Guido Grazioli <guido.grazioli at gmail.com> - 1.6-2
+- Remove -client-with-dependencies jar to get rid of duplicate libraries
+- Switch off maven execution debug output
+
 * Mon Apr 09 2012 Guido Grazioli <guido.grazioli at gmail.com> - 1.6-1
 - Update to 1.6 release
 - Fix typo in description