[qpid-proton-java/f20] fix BC dep

[gil]

commit d0cab9f79915070a60e2004012126399ff5e90f8
Author: gil <puntogil at libero.it>
Date:   Mon May 19 16:32:20 2014 +0200

    fix BC dep

 qpid-proton-java.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/qpid-proton-java.spec b/qpid-proton-java.spec
index 14b612d..8cfe0f5 100644
--- a/qpid-proton-java.spec
+++ b/qpid-proton-java.spec
@@ -10,7 +10,9 @@ BuildRequires: maven-local
 BuildRequires: mvn(junit:junit)
 BuildRequires: mvn(org.apache.maven.doxia:doxia-module-markdown)
 BuildRequires: mvn(org.apache.maven.plugins:maven-site-plugin)
-BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
+# bcpkix-jdk15on is not available on f20
+BuildRequires: mvn(org.bouncycastle:bcprov-jdk16)
+#BuildRequires: mvn(org.bouncycastle:bcpkix-jdk15on)
 BuildRequires: mvn(org.apache.geronimo.specs:geronimo-jms_1.1_spec)
 BuildRequires: mvn(org.apache.geronimo.specs:specs)
 BuildRequires: mvn(org.fusesource.hawtbuf:hawtbuf)
@@ -39,13 +41,16 @@ rm -r tools docs config.sh examples/messenger/c \
   examples/include CMakeLists.txt bin proton-c \
   tests/smoke tests/ruby tests/python tests/tools
 
-sed -i 's|PEMReader|PEMParser|' \
- proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
-sed -i 's|pemReader = new PEMParser(reader, passwordFinder);|pemReader = new PEMParser(reader);|' \
- proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+# Fix for BC >= 1.50
+#sed -i 's|PEMReader|PEMParser|' \
+# proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
+#sed -i 's|pemReader = new PEMParser(reader, passwordFinder);|pemReader = new PEMParser(reader);|' \
+# proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ssl/SslEngineFacadeFactory.java
 
 %pom_remove_dep org.python:jython-standalone tests
 rm -r tests/java/org/apache/qpid/proton/JythonTest.java
+# Use proper BC aId
+sed -i 's|bcpkix-jdk15on|bcprov-jdk16|' tests/pom.xml
 
 %mvn_alias :proton-j org.apache.qpid:proton-api org.apache.qpid:proton-j-impl