[trilead-ssh2] 215

[Tom Callaway]

commit b3253d6542435a596d94a2a75b47b0f7fb7d9843
Author: Tom Callaway <spot at fedoraproject.org>
Date:   Thu May 16 15:49:42 2013 -0400

    215

 .gitignore                      |    1 +
 build.xml                       |    2 +-
 sources                         |    2 +-
 trilead-ssh2-1.0.0-build215.pom |   31 +++++++++++++++++++++++++++++++
 trilead-ssh2.spec               |   29 +++++++++++++----------------
 5 files changed, 47 insertions(+), 18 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index a91eb78..a1fac55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 trilead-ssh2-build213.zip
+/trilead-ssh2-build215.zip
diff --git a/build.xml b/build.xml
index 798ca58..15e5706 100644
--- a/build.xml
+++ b/build.xml
@@ -2,7 +2,7 @@
 <project basedir="." default="dist" name="trilead-ssh2">
 	<target name="init">
 		<property name="build.dir" value="build"/>
-		<property name="src.dir" value="src"/>
+		<property name="src.dir" value="trilead-ssh2/src"/>
 	</target>
 	<target name="compile" depends="init">
 		<mkdir dir="${build.dir}"/>
diff --git a/sources b/sources
index 2f5361d..2fd173c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f6ccb92074b60c1635c08796ad46a1fd  trilead-ssh2-build213.zip
+b4835a2fb3080e0719f1e198298bbd04  trilead-ssh2-build215.zip
diff --git a/trilead-ssh2-1.0.0-build215.pom b/trilead-ssh2-1.0.0-build215.pom
new file mode 100644
index 0000000..f0c66bb
--- /dev/null
+++ b/trilead-ssh2-1.0.0-build215.pom
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>com.trilead</groupId>
+  <artifactId>trilead-ssh2</artifactId>
+  <version>1.0.0-build215</version>
+  <name>Trilead SSH2 Library</name>
+  <description>Java SSH2 Library</description>
+  <url>http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2</url>
+  <licenses>
+    <license>
+      <name>Trilead Library License</name>
+      <url>http://www.svnkit.com/TRILEAD-LICENSE.txt</url>
+    </license>
+  </licenses>
+  <developers>
+    <developer>
+      <id>trilead</id>
+      <name>Trilead AG</name>
+    </developer>
+    <developer>
+      <id>tmate</id>
+      <name>TMate Software</name>
+    </developer>
+  </developers>
+  <scm>
+    <connection>scm:svn:http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2</connection>
+    <url>http://svn.svnkit.com/repos/3rdparty/com.trilead.ssh2</url>
+  </scm>
+</project>
diff --git a/trilead-ssh2.spec b/trilead-ssh2.spec
index 8c88412..78960cf 100644
--- a/trilead-ssh2.spec
+++ b/trilead-ssh2.spec
@@ -1,6 +1,6 @@
 Name:           trilead-ssh2
-Version:        213
-Release:        11%{?dist}
+Version:        215
+Release:        1%{?dist}
 Summary:        SSH-2 protocol implementation in pure Java
 
 Group:          Development/Tools
@@ -10,7 +10,7 @@ URL:            http://www.trilead.com/Products/Trilead_SSH_for_Java/
 #http://www.trilead.com/DesktopModules/Releases/download_file.aspx?ReleaseId=4102
 Source0:        trilead-ssh2-build%{version}.zip
 Source1:        build.xml
-Source2:        http://mirrors.ibiblio.org/pub/mirrors/maven2/org/tmatesoft/svnkit/%{name}/build%{version}-svnkit-1.3-patch/%{name}-build%{version}-svnkit-1.3-patch.pom
+Source2:        http://repo1.maven.org/maven2/com/trilead/trilead-ssh2/1.0.0-build%{version}/trilead-ssh2-1.0.0-build%{version}.pom
 
 BuildRequires:  jpackage-utils
 BuildRequires:  java-devel
@@ -20,6 +20,10 @@ Requires:       java
 Requires(post):   jpackage-utils
 Requires(postun): jpackage-utils
 
+# javadoc is gone in 215
+Provides:	%{name}-javadoc = %{version}-%{release}
+Obsoletes:	%{name}-javadoc <= 213-11
+
 BuildArch:      noarch
 
 #Obsoletes:              ganymed-ssh2 <= 210
@@ -50,11 +54,10 @@ cp %{SOURCE1} .
 iconv -f ISO-8859-1 -t UTF-8 -o HISTORY.txt HISTORY.txt
 
 # delete the jars that are in the archive
-rm %{name}-build%{version}.jar
+find . -name '*.jar' -delete
 
 # fixing wrong-file-end-of-line-encoding warnings
-sed -i 's/\r//' LICENSE.txt README.txt HISTORY.txt faq/FAQ.html
-find examples -name \*.java -exec sed -i 's/\r//' {} \;
+sed -i 's/\r//' LICENSE.txt README.txt HISTORY.txt
 
 %build
 ant
@@ -70,10 +73,6 @@ mkdir -p %{buildroot}%{_mavenpomdir}
 cp %{SOURCE2} %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 %add_to_maven_depmap org.tmatesoft.svnkit %{name} %{version} JPP %{name}
 
-# javadoc
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
 %post
 %update_maven_depmap
 
@@ -86,15 +85,13 @@ cp -pr javadoc/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
 %{_mavenpomdir}/JPP-%{name}.pom
 %{_mavendepmapfragdir}/%{name}
 %{_javadir}/*
-%doc LICENSE.txt HISTORY.txt README.txt faq examples
-
-
-%files javadoc
-%defattr(-,root,root,-)
-%{_javadocdir}/%{name}
+%doc LICENSE.txt HISTORY.txt README.txt
 
 
 %changelog
+* Thu May 16 2013 Tom Callaway <spot at fedoraproject.org> - 215-1
+- update to 215
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 213-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild