[bouncycastle-mail] add bcpkix suppport

[gil]

commit d0286bedcbaa9389cac010fbc3b701dc7cef0791
Author: gil <puntogil at libero.it>
Date:   Tue Mar 4 15:24:42 2014 +0100

    add bcpkix suppport

 bouncycastle-mail.spec |   29 ++++++++++++++---------------
 sources                |    3 +--
 2 files changed, 15 insertions(+), 17 deletions(-)
---
diff --git a/bouncycastle-mail.spec b/bouncycastle-mail.spec
index 978fa87..688c9c7 100644
--- a/bouncycastle-mail.spec
+++ b/bouncycastle-mail.spec
@@ -4,20 +4,21 @@
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          %{ver}
-Release:          2%{?dist}
+Release:          3%{?dist}
 License:          MIT
 URL:              http://www.bouncycastle.org/
-# sh create-tarball.sh
-Source0:          bcmail-%{archivever}.tar.gz
+Source0:          http://www.bouncycastle.org/download/bcmail-%{archivever}.tar.gz
 Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcmail-jdk15on/%{version}/bcmail-jdk15on-%{version}.pom
-Source2:          create-tarball.sh
+
 BuildArch:        noarch
 BuildRequires:    bouncycastle = %{version}
+BuildRequires:    bouncycastle-pkix = %{version}
 BuildRequires:    java-devel >= 1.7
 BuildRequires:    javamail
 BuildRequires:    javapackages-tools
 BuildRequires:    junit
 Requires:         bouncycastle = %{version}
+Requires:         bouncycastle-pkix = %{version}
 Requires:         java-headless >= 1.7
 Requires:         javamail
 Requires:         javapackages-tools
@@ -38,25 +39,20 @@ API documentation for the %{name} package.
 
 %prep
 %setup -q -n bcmail-%{archivever}
+mkdir src
+unzip -qq src.zip -d src/
+
+find . -type f -name "*.class" -delete
+find . -type f -name "*.jar" -delete
 
-# following tests fail due to "bc.test.data.home property not set"
-sed -i 's/testSampleCr()/disabled_&/' src/org/bouncycastle/cert/cmp/test/AllTests.java
-sed -i 's|suite.addTest(Rfc4134Test.suite());|//&|' src/org/bouncycastle/cms/test/AllTests.java
-# NPE - probably due to some missing resources
-sed -i 's|suite.addTest(NewSignedDataTest.suite());|//&|' src/org/bouncycastle/cms/test/AllTests.java
-sed -i 's|suite.addTest(BcSignedDataTest.suite());|//&|' src/org/bouncycastle/cms/test/AllTests.java
 # too many "IOException: Stream closed" failures
 rm -f src/org/bouncycastle/mail/smime/test/AllTests.java
-# missing test data
-sed -i 's|new ParserTest()|//&|' src/org/bouncycastle/openssl/test/AllTests.java
 
 cp %{SOURCE1} pom.xml
-# TODO: remove when #1022551 is resolved
-%pom_remove_dep :bcpkix-jdk15on
 
 %build
 pushd src
-  export CLASSPATH=$(build-classpath junit bcprov javamail)
+  export CLASSPATH=$(build-classpath junit bcprov bcpkix javamail)
   %javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcmail.jar"
   # Exclude all */test/* , cf. upstream
@@ -107,6 +103,9 @@ popd
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Mar 04 2014 gil cattaneo <puntogil at libero.it> 1.50-3
+- add bcpkix suppport
+
 * Tue Feb 25 2014 Michal Srb <msrb at redhat.com> - 1.50-2
 - Remove unavailable dep from pom.xml
 
diff --git a/sources b/sources
index 2c171dd..514c172 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-e35abe7dba650f4f2992196fd521cff5  bcmail-jdk15on-150.tar.gz
-8fa5f1ead5e52de043c900ee14b8e769  bcmail-jdk15on-1.50.pom
+c4dad8c7e032bd6c5430f9bc9609e412  bcmail-jdk15on-150.tar.gz