[bouncycastle-mail] Update to upstream version 1.50
Michal Srb
msrb at fedoraproject.org
Tue Feb 25 06:37:23 UTC 2014
commit 4425d4fd3ac6f54399598f262ca62b4ed9a1f6a5
Author: Michal Srb <msrb at redhat.com>
Date: Mon Feb 24 23:57:35 2014 +0100
Update to upstream version 1.50
- Switch to java-headless (Resolves: rhbz#1067986)
- Enable (some) tests
.gitignore | 2 +
bcmail-jdk16-1.46.pom | 29 ---------------------------
bouncycastle-mail.spec | 51 +++++++++++++++++++++++++++++------------------
create-tarball.sh | 33 +++++++++++++++++++++++++++++++
sources | 3 +-
5 files changed, 68 insertions(+), 50 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index c6a7595..03dacfc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
bcmail-jdk16-145-FEDORA.tar.gz
/bcmail-jdk16-146-FEDORA.tar.gz
/bcmail-jdk16-146.tar.gz
+/bcmail-jdk15on-150.tar.gz
+/bcmail-jdk15on-1.50.pom
diff --git a/bouncycastle-mail.spec b/bouncycastle-mail.spec
index 7a5fd26..e5509a7 100644
--- a/bouncycastle-mail.spec
+++ b/bouncycastle-mail.spec
@@ -1,26 +1,26 @@
-%global ver 1.46
-%global archivever jdk16-%(echo %{ver}|sed 's|\\\.||')
+%global ver 1.50
+%global archivever jdk15on-%(echo %{ver}|sed 's|\\\.||')
Summary: S/MIME and CMS libraries for Bouncy Castle
Name: bouncycastle-mail
Version: %{ver}
-Release: 11%{?dist}
+Release: 1%{?dist}
License: MIT
URL: http://www.bouncycastle.org/
-Source0: http://www.bouncycastle.org/download/bcmail-%{archivever}.tar.gz
-Source1: http://repo2.maven.org/maven2/org/bouncycastle/bcmail-jdk16/%{version}/bcmail-jdk16-%{version}.pom
+# sh create-tarball.sh
+Source0: 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 >= 1.46-5
+BuildRequires: bouncycastle = %{version}
BuildRequires: java-devel >= 1.7
BuildRequires: javamail
-BuildRequires: jpackage-utils >= 1.5
+BuildRequires: javapackages-tools
BuildRequires: junit
-Requires: bouncycastle == %{version}
-Requires: bouncycastle >= 1.46-5
-Requires: java >= 1.7
+Requires: bouncycastle = %{version}
+Requires: java-headless >= 1.7
Requires: javamail
-Requires: jpackage-utils >= 1.5
+Requires: javapackages-tools
Provides: bcmail = %{version}-%{release}
%description
@@ -38,11 +38,18 @@ API documentation for the %{name} package.
%prep
%setup -q -n bcmail-%{archivever}
-mkdir src
-unzip -qq src.zip -d src/
-# Remove provided binaries
-find . -type f -name "*.class" -exec rm -f {} \;
-find . -type f -name "*.jar" -exec rm -f {} \;
+
+# 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
+
%build
pushd src
@@ -75,15 +82,14 @@ cp -pr docs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
# maven pom
install -dm 755 $RPM_BUILD_ROOT%{_mavenpomdir}
install -pm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_mavenpomdir}/JPP-bcmail.pom
-%add_maven_depmap JPP-bcmail.pom bcmail.jar
+%add_maven_depmap -a "org.bouncycastle:bcmail-jdk16" JPP-bcmail.pom bcmail.jar
%check
pushd src
export CLASSPATH=$PWD:$(build-classpath junit javamail bcprov)
for test in $(find . -name AllTests.class) ; do
test=${test#./} ; test=${test%.class} ; test=${test//\//.}
- # TODO: failures; get them fixed and remove || :
- %java org.junit.runner.JUnitCore $test || :
+ %java org.junit.runner.JUnitCore $test
done
popd
@@ -98,6 +104,11 @@ popd
%{_javadocdir}/%{name}
%changelog
+* Mon Feb 24 2014 Michal Srb <msrb at redhat.com> - 1.50-1
+- Update to upstream version 1.50
+- Switch to java-headless (Resolves: rhbz#1067986)
+- Enable (some) tests
+
* Tue Oct 22 2013 gil cattaneo <puntogil at libero.it> 1.46-11
- remove versioned Jars
diff --git a/create-tarball.sh b/create-tarball.sh
new file mode 100644
index 0000000..7307087
--- /dev/null
+++ b/create-tarball.sh
@@ -0,0 +1,33 @@
+#!/bin/bash -e
+
+version=`rpmspec -P *.spec | sed -n 's/^Version:\s*\(.*\)\s*/\1/p'`
+dotlessver=`echo $version | sed 's/\.//'`
+echo "version: $version"
+
+
+wget http://www.bouncycastle.org/download/bcmail-jdk15on-${dotlessver}.tar.gz
+# upstream is moving classes back and forth...
+wget https://www.bouncycastle.org/download/bcpkix-jdk15on-${dotlessver}.tar.gz
+
+tar xvf bcpkix-jdk15on-${dotlessver}.tar.gz
+pushd bcpkix-jdk15on-${dotlessver}
+mkdir src
+unzip -qq src.zip -d src/
+popd
+
+tar xvf bcmail-jdk15on-${dotlessver}.tar.gz
+pushd bcmail-jdk15on-${dotlessver}
+mkdir src
+unzip -qq src.zip -d src/
+cp -r ../bcpkix-jdk15on-${dotlessver}/src/org/bouncycastle/{cert,cms,operator,pkcs,openssl} \
+ src/org/bouncycastle/
+# Remove provided binaries
+find . -type f -name "*.class" -exec rm -f {} \;
+find . -type f -name "*.jar" -exec rm -f {} \;
+rm src.zip
+popd
+
+rm -Rf bcpkix-jdk15on-${dotlessver}
+rm -f bcpkix-jdk15on-${dotlessver}.tar.gz bcmail-jdk15on-${dotlessver}.tar.gz
+
+tar czvf bcmail-jdk15on-${dotlessver}.tar.gz bcmail-jdk15on-${dotlessver}
diff --git a/sources b/sources
index 4fc52c7..2c171dd 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-d7c84370119dcec7b8f01a484e9a26fc bcmail-jdk16-146.tar.gz
+e35abe7dba650f4f2992196fd521cff5 bcmail-jdk15on-150.tar.gz
+8fa5f1ead5e52de043c900ee14b8e769 bcmail-jdk15on-1.50.pom
More information about the scm-commits
mailing list