[istack-commons] 2.17

[Tom Callaway]

commit 3abc61b0b03b83f2c7b69a04f5723e9c2ec13ba7
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu May 16 15:46:40 2013 -0400

    2.17

 .gitignore          |    1 +
 istack-commons.spec |   31 +++++++++++++++++--------------
 sources             |    2 +-
 3 files changed, 19 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c7c6a66..e61b7df 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /istack-commons-2.6.1.tar.gz
+/istack-commons-2.17.tar.gz
diff --git a/istack-commons.spec b/istack-commons.spec
index e710081..8a211ac 100644
--- a/istack-commons.spec
+++ b/istack-commons.spec
@@ -1,17 +1,16 @@
 Name:           istack-commons
-Version:        2.6.1
-Release:        7%{?dist}
+Version:        2.17
+Release:        1%{?dist}
 Summary:        Common code for some Glassfish projects
 Group:          Development/Libraries
-License:        CDDL and GPLv2
+License:        CDDL and GPLv2 with exceptions
 URL:            http://istack-commons.java.net
 
-# svn export https://svn.java.net/svn/istack-commons~svn/tags/istack-commons-2.6.1/ istack-commons-2.6.1
-# find istack-commons-2.6.1/ -name '*.class' -delete
-# find istack-commons-2.6.1/ -name '*.jar' -delete
-# tar -zcvf istack-commons-2.6.1.tar.gz istack-commons-2.6.1
+# svn export https://svn.java.net/svn/istack-commons~svn/tags/istack-commons-2.17/ istack-commons-2.17
+# find istack-commons-2.17/ -name '*.class' -delete
+# find istack-commons-2.17/ -name '*.jar' -delete
+# tar -zcvf istack-commons-2.17.tar.gz istack-commons-2.17
 Source0:        %{name}-%{version}.tar.gz
-Patch0:         %{name}-%{version}-activation.patch
 BuildArch:      noarch
 
 BuildRequires:  ant
@@ -36,6 +35,8 @@ BuildRequires:  maven-shared-file-management
 BuildRequires:  maven-surefire-plugin
 BuildRequires:  plexus-archiver
 BuildRequires:  plexus-io
+BuildRequires:	svnkit
+BuildRequires:	trilead-ssh2
 
 Requires:       jpackage-utils
 Requires:       java
@@ -72,7 +73,6 @@ This package contains the API documentation for %{name}.
 
 %prep
 %setup -q
-%patch0 -p1
 rm -rf test/lib/*.zip
 
 
@@ -100,7 +100,7 @@ cp -p runtime/target/istack-commons-runtime-%{version}.jar %{buildroot}%{_javadi
 cp -p tools/target/istack-commons-tools-%{version}.jar %{buildroot}%{_javadir}/%{name}-tools.jar
 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/maven-%{name}-plugin-%{version}.jar %{buildroot}%{_javadir}/maven-%{name}-plugin.jar
+cp -p maven-plugin/target/%{name}-maven-plugin-%{version}.jar %{buildroot}%{_javadir}/%{name}-maven-plugin.jar
 
 # JAVADOC
 cp -rp target/site/apidocs/* %{buildroot}%{_javadocdir}/%{name}
@@ -111,7 +111,7 @@ cp -p runtime/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-runtime.pom
 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-maven-%{name}-plugin.pom
+cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}-maven-plugin.pom
 
 # DEPMAP
 %add_maven_depmap JPP-%{name}.pom
@@ -119,7 +119,7 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.
 %add_maven_depmap JPP-%{name}-tools.pom %{name}-tools.jar
 %add_maven_depmap JPP-%{name}-test.pom %{name}-test.jar
 %add_maven_depmap JPP-%{name}-buildtools.pom %{name}-buildtools.jar
-%add_maven_depmap JPP-maven-%{name}-plugin.pom maven-%{name}-plugin.jar -f maven-plugin
+%add_maven_depmap JPP-%{name}-maven-plugin.pom %{name}-maven-plugin.jar -f maven-plugin
 
 %files
 %{_mavenpomdir}/JPP-%{name}-runtime.pom
@@ -135,8 +135,8 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.
 %doc Licence.txt
 
 %files -n maven-istack-commons-plugin
-%{_javadir}/maven-%{name}-plugin.jar
-%{_mavenpomdir}/JPP-maven-%{name}-plugin.pom
+%{_javadir}/%{name}-maven-plugin.jar
+%{_mavenpomdir}/JPP-%{name}-maven-plugin.pom
 %{_mavendepmapfragdir}/%{name}-maven-plugin
 %doc Licence.txt
 
@@ -146,6 +146,9 @@ cp -p maven-plugin/pom.xml %{buildroot}%{_mavenpomdir}/JPP-maven-%{name}-plugin.
 
 
 %changelog
+* Thu May 16 2013 Tom Callaway <spot at fedoraproject.org> - 2.17-1
+- update to 2.17
+
 * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.6.1-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 56f2572..b28d252 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-b68fa82b8c543596212eafcddff68d06  istack-commons-2.6.1.tar.gz
+6d03638fb6db5210b82cbcb972ff2fc4  istack-commons-2.17.tar.gz