[bouncycastle-pg] Update to upstream version 1.50
Michal Srb
msrb at fedoraproject.org
Tue Feb 25 06:37:24 UTC 2014
commit 7f85cd3984656ba90e246b0568d693b39b7f8f7e
Author: Michal Srb <msrb at redhat.com>
Date: Mon Feb 24 11:09:22 2014 +0100
Update to upstream version 1.50
- Switch to java-headless
.gitignore | 2 +
bcpg-jdk15on-1.48.pom | 41 ----
bcpg-jdk16-1.46.pom | 34 ---
bouncycastle-pg-1.46-OSGi.bnd | 32 ---
bouncycastle-pg-1.48-OSGi.bnd | 44 ----
bouncycastle-pg-1.48-build.xml | 218 --------------------
...-build.xml => bouncycastle-pg-1.50-01-build.xml | 4 +-
bouncycastle-pg-1.50-OSGi.bnd | 57 +++++
bouncycastle-pg.spec | 38 +++--
sources | 3 +-
10 files changed, 88 insertions(+), 385 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e40547f..adc2f56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
/bcpg-jdk15on-146.tar.gz
/bcpg-jdk16-146.tar.gz
/bcpg-jdk15on-148.tar.gz
+/bcpg-jdk15on-150.tar.gz
+/bcpg-jdk15on-1.50.pom
diff --git a/bouncycastle-pg-1.46-01-build.xml b/bouncycastle-pg-1.50-01-build.xml
similarity index 99%
rename from bouncycastle-pg-1.46-01-build.xml
rename to bouncycastle-pg-1.50-01-build.xml
index 9192c8b..f6e9dcb 100644
--- a/bouncycastle-pg-1.46-01-build.xml
+++ b/bouncycastle-pg-1.50-01-build.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- ====================================================================== -->
-<!-- bcpg 1.46 by gil -->
+<!-- bcpg 1.50 by gil -->
<!-- ====================================================================== -->
<project name="build-bcpg" default="package" basedir=".">
@@ -11,7 +11,7 @@
<!-- ====================================================================== -->
- <property name="build.version" value="1.46"/>
+ <property name="build.version" value="1.50"/>
<property name="jar.name" value="bcpg"/>
<property name="build.dir" value="build"/>
<property name="build.classes" value="${build.dir}/classes"/>
diff --git a/bouncycastle-pg-1.50-OSGi.bnd b/bouncycastle-pg-1.50-OSGi.bnd
new file mode 100644
index 0000000..6618b84
--- /dev/null
+++ b/bouncycastle-pg-1.50-OSGi.bnd
@@ -0,0 +1,57 @@
+# BND/OSGI Properties by gil
+Manifest-Version: 1.0
+Import-Package: org.bouncycastle.asn1;version="1.50", \
+ org.bouncycastle.asn1.nist;version="1.50", \
+ org.bouncycastle.asn1.x509;version="1.50", \
+ org.bouncycastle.asn1.x9;version="1.50", \
+ org.bouncycastle.crypto;version="1.50", \
+ org.bouncycastle.crypto.digests;version="1.50", \
+ org.bouncycastle.crypto.encodings;version="1.50", \
+ org.bouncycastle.crypto.engines;version="1.50", \
+ org.bouncycastle.crypto.generators;version="1.50", \
+ org.bouncycastle.crypto.io;version="1.50", \
+ org.bouncycastle.crypto.modes;version="1.50", \
+ org.bouncycastle.crypto.params;version="1.50", \
+ org.bouncycastle.crypto.signers;version="1.50", \
+ org.bouncycastle.jcajce;version="1.50", \
+ org.bouncycastle.jce.interfaces;version="1.50", \
+ org.bouncycastle.jce.provider;version="1.50", \
+ org.bouncycastle.jce.spec;version="1.50", \
+ org.bouncycastle.math.ec;version="1.50", \
+ org.bouncycastle.util;version="1.50", \
+ org.bouncycastle.util.encoders;version="1.50", \
+ org.bouncycastle.util.io;version="1.50"
+Bundle-RequiredExecutionEnvironment: J2SE-1.5, JavaSE-1.6, JavaSE-1.7
+Implementation-Vendor-Id: org.bouncycastle
+Bundle-Version: 1.50
+Bundle-Name: bcpg
+Bundle-ManifestVersion: 2
+Application-Library-Allowable-Codebase: *
+Specification-Vendor: BouncyCastle.org
+Caller-Allowable-Codebase: *
+Extension-Name: org.bouncycastle.bcpg
+Application-Name: Bouncy Castle OpenPGP API
+Implementation-Version: 1.50.0
+Implementation-Vendor: BouncyCastle.org
+Created-By: 1.5.0_08 (Sun Microsystems Inc.)
+Codebase: *
+Specification-Version: 1.1
+Export-Package: org.bouncycastle.apache.bzip2;version="1.50",org.bounc
+ ycastle.bcpg;version="1.50";uses:="org.bouncycastle.asn1,org.bouncyca
+ stle.math.ec",org.bouncycastle.bcpg.attr;version="1.50";uses:="org.bo
+ uncycastle.bcpg",org.bouncycastle.bcpg.sig;version="1.50";uses:="org.
+ bouncycastle.bcpg",org.bouncycastle.openpgp;version="1.50";uses:="org
+ .bouncycastle.bcpg,org.bouncycastle.bcpg.attr,org.bouncycastle.bcpg.s
+ ig,org.bouncycastle.openpgp.operator",org.bouncycastle.openpgp.exampl
+ es;version="1.50";uses:="org.bouncycastle.openpgp",org.bouncycastle.o
+ penpgp.operator;version="1.50";uses:="org.bouncycastle.asn1,org.bounc
+ ycastle.bcpg,org.bouncycastle.math.ec,org.bouncycastle.openpgp",org.b
+ ouncycastle.openpgp.operator.bc;version="1.50";uses:="org.bouncycastl
+ e.bcpg,org.bouncycastle.crypto,org.bouncycastle.crypto.params,org.bou
+ ncycastle.openpgp,org.bouncycastle.openpgp.operator",org.bouncycastle
+ .openpgp.operator.jcajce;version="1.50";uses:="org.bouncycastle.bcpg,
+ org.bouncycastle.openpgp,org.bouncycastle.openpgp.operator"
+Trusted-Library: true
+Originally-Created-By: ${java.version} (${java.vendor})
+Bundle-SymbolicName: bcpg
+
diff --git a/bouncycastle-pg.spec b/bouncycastle-pg.spec
index 3f0c5d3..14cf564 100644
--- a/bouncycastle-pg.spec
+++ b/bouncycastle-pg.spec
@@ -1,20 +1,20 @@
-%global ver 146
-%global archivever jdk16-%(echo %{ver}|sed 's|\\\.||')
+%global ver 150
+%global archivever jdk15on-%(echo %{ver}|sed 's|\\\.||')
+
Name: bouncycastle-pg
-Version: 1.46
-Release: 10%{?dist}
+Version: 1.50
+Release: 1%{?dist}
Summary: Bouncy Castle OpenPGP API
-Group: Development/Libraries
# modified BZIP2 library org/bouncycastle/apache/bzip2 ASL 2.0
License: ASL 2.0 and MIT
URL: http://www.bouncycastle.org/
Source0: http://www.bouncycastle.org/download/bcpg-%{archivever}.tar.gz
-Source1: http://repo2.maven.org/maven2/org/bouncycastle/bcpg-jdk16/%{version}/bcpg-jdk16-%{version}.pom
+Source1: http://repo2.maven.org/maven2/org/bouncycastle/bcpg-jdk15on/%{version}/bcpg-jdk15on-%{version}.pom
Source2: bouncycastle-pg-%{version}-01-build.xml
Source3: bouncycastle-pg-%{version}-OSGi.bnd
BuildRequires: java-devel
-BuildRequires: jpackage-utils
+BuildRequires: javapackages-tools
BuildRequires: ant
BuildRequires: ant-junit
@@ -25,8 +25,8 @@ BuildRequires: bouncycastle = %{version}
Requires: bouncycastle = %{version}
-Requires: java
-Requires: jpackage-utils
+Requires: java-headless
+Requires: javapackages-tools
BuildArch: noarch
%description
@@ -64,12 +64,20 @@ cp -p %{SOURCE3} bcpg.bnd
# this test fails: bc.test.data.home property not set
rm src/test/org/bouncycastle/openpgp/test/DSA2Test.java
-sed -i "s|suite.addTestSuite(DSA2Test.class);|//suite.addTestSuite(DSA2Test.class);|" \
+sed -i "s|suite.addTestSuite(DSA2Test.class);|//&|" \
+ src/test/org/bouncycastle/openpgp/test/AllTests.java
+rm src/test/org/bouncycastle/openpgp/test/PGPUnicodeTest.java
+sed -i "s|suite.addTestSuite(PGPUnicodeTest.class);|//&|" \
src/test/org/bouncycastle/openpgp/test/AllTests.java
+# another failing test
+# missing resource "bigpub.asc"
+rm src/test/org/bouncycastle/openpgp/test/PGPParsingTest.java
+sed -i 's/new PGPParsingTest()//' src/test/org/bouncycastle/openpgp/test/RegressionTest.java
+
%build
-%ant jar javadoc
+ant jar javadoc
%install
@@ -81,7 +89,7 @@ cp -pr build/apidocs/* %{buildroot}%{_javadocdir}/%{name}
mkdir -p %{buildroot}%{_mavenpomdir}
install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcpg.pom
-%add_maven_depmap JPP-bcpg.pom bcpg.jar
+%add_maven_depmap -a "org.bouncycastle:bcpg-jdk16" JPP-bcpg.pom bcpg.jar
%files -f .mfiles
%doc *.html
@@ -91,6 +99,10 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcpg.pom
%doc LICENSE.html
%changelog
+* Mon Feb 24 2014 Michal Srb <msrb at redhat.com> - 1.50-1
+- Update to upstream version 1.50
+- Switch to java-headless
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.46-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
@@ -123,4 +135,4 @@ install -pm 644 %{SOURCE1} %{buildroot}%{_mavenpomdir}/JPP-bcpg.pom
- add BR zip
* Sun Mar 25 2012 gil cattaneo <puntogil at libero.it> 1.46-1
-- initial rpm
\ No newline at end of file
+- initial rpm
diff --git a/sources b/sources
index 453ea47..53bc26b 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-f8c3b1c4f1e1474da8edf1caf8c193cb bcpg-jdk16-146.tar.gz
+5c31e02c90383bb6db8accddbebddf41 bcpg-jdk15on-150.tar.gz
+c6b54efad78b88c1743a470bdea7d914 bcpg-jdk15on-1.50.pom
More information about the scm-commits
mailing list