[apache-sshd] Update to upstream 0.11.0 (rhbz#1094049)

[gil]

commit 884cf6c4a9c41cfe99bddabde0c5eeb8f3883f72
Author: gil <puntogil at libero.it>
Date:   Mon May 5 14:27:01 2014 +0200

    Update to upstream 0.11.0 (rhbz#1094049)

 .gitignore       |    1 +
 apache-sshd.spec |   33 +++++++++++++++++----------------
 sources          |    2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index d911913..477d6d5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@
 /apache-sshd-0.7.0-src.tar.gz
 /apache-sshd-0.9.0-src.tar.gz
 /apache-sshd-0.8.0-src.tar.gz
+/apache-sshd-0.11.0-src.tar.gz
diff --git a/apache-sshd.spec b/apache-sshd.spec
index a1b28d6..3f96149 100644
--- a/apache-sshd.spec
+++ b/apache-sshd.spec
@@ -1,25 +1,18 @@
 Name: apache-sshd
-Version: 0.9.0
-Release: 3%{?dist}
+Version: 0.11.0
+Release: 1%{?dist}
 Summary: Apache SSHD
 License: ASL 2.0
 URL: http://mina.apache.org/sshd-project/
 
-# Note that the version is hardcoded as 0.8.0 because we needed to revert to
-# upstream version 0.8.0 due to bug 1021273, but as the version number can't go
-# backwards it has to stay as 0.9.0:
-Source0: http://www.apache.org/dyn/closer.cgi/mina/sshd/0.8.0/%{name}-0.8.0-src.tar.gz
-
-# User version of bouncycastle for JDK6:
-Patch0: %{name}-use-bouncycastle-for-jdk6.patch
-
-# Use tomcat-coyote instead of unavailable tomcat-apr
-Patch1: %{name}-use-tomcat-coyote.patch
+Source0: http://www.apache.org/dist/mina/sshd/%{version}/%{name}-%{version}-src.tar.gz
 
 BuildArch: noarch
 
 BuildRequires: apache-mina
 BuildRequires: bouncycastle >= 1.46
+BuildRequires: bouncycastle-pkix
+BuildRequires: bouncycastle-pg
 BuildRequires: jzlib >= 1.1.0
 BuildRequires: maven-local
 BuildRequires: maven-plugin-bundle
@@ -34,7 +27,9 @@ Requires: jpackage-utils
 Requires: mvn(com.jcraft:jzlib)
 Requires: mvn(org.apache.mina:mina-core)
 Requires: mvn(org.apache.tomcat:tomcat-coyote)
-Requires: mvn(org.bouncycastle:bcprov-jdk16)
+#Requires: mvn(org.bouncycastle:bcprov-jdk15on)
+Requires: mvn(org.bouncycastle:bcpkix-jdk15on)
+Requires: mvn(org.bouncycastle:bcpg-jdk15on)
 Provides: mvn(org.apache.sshd:sshd) = %{version}
 Provides: mvn(org.apache.sshd:sshd-core) = %{version}
 Provides: mvn(org.apache.sshd:sshd-sftp) = %{version}
@@ -54,9 +49,10 @@ This package provides %{name}.
 
 
 %prep
-%setup -q -n %{name}-0.8.0
-%patch0 -p1
-%patch1 -p1
+%setup -q
+
+# Use tomcat-coyote instead of unavailable tomcat-apr
+sed -i "s,<groupId>tomcat,<groupId>org.apache.tomcat,;s,<artifactId>tomcat-apr,<artifactId>tomcat-coyote,;s,<version>5.5.23,<version>7.0.52," pom.xml */pom.xml
 
 # Build the core only:
 %pom_disable_module assembly
@@ -64,6 +60,8 @@ This package provides %{name}.
 
 # Disable the plugins that we don't need:
 %pom_remove_plugin :maven-remote-resources-plugin
+# Too many files with unapproved license
+%pom_remove_plugin org.apache.rat:apache-rat-plugin
 
 %build
 
@@ -88,6 +86,9 @@ This package provides %{name}.
 
 
 %changelog
+* Mon May 05 2014 gil cattaneo <puntogil at libero.it> - 0.11.0-1
+- Update to upstream 0.11.0 (rhbz#1094049)
+
 * Wed Nov 27 2013 Juan Hernandez <juan.hernandez at redhat.com> - 0.9.0-3
 - Revert to upstream version 0.8.0 due to bug 1021273. Note that the
   version number can't go backwards, so it stays at 0.9.0.
diff --git a/sources b/sources
index d6cb3a3..3cbb239 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c8c71cc9de71eb76296027ac040dd59a  apache-sshd-0.8.0-src.tar.gz
+2e29a9866649acf11531722bea4c8cf9  apache-sshd-0.11.0-src.tar.gz