[bouncycastle] Fix java BR/R

Michal Srb msrb at fedoraproject.org
Wed Feb 26 08:44:05 UTC 2014


commit 8b3afa7efb97b50c69942ad9bf96ab092edecb7f
Author: Michal Srb <msrb at redhat.com>
Date:   Wed Feb 26 09:37:06 2014 +0100

    Fix java BR/R
    
    - Build with -source/target 1.5
    - s/organised/organized/
    
    Thanks Mattias Ellert

 bouncycastle.spec |   15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)
---
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 6ea730f..5f3071a 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -5,7 +5,7 @@
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          %{ver}
-Release:          1%{?dist}
+Release:          2%{?dist}
 License:          MIT
 URL:              http://www.bouncycastle.org
 # Use original sources from here on out.
@@ -16,15 +16,15 @@ Requires:         javapackages-tools
 Requires(post):   javapackages-tools
 Requires(postun): javapackages-tools
 BuildArch:        noarch
-BuildRequires:    java-devel >= 1.7
-Requires:         java-headless >= 1.7
+BuildRequires:    java-devel
+Requires:         java-headless
 BuildRequires:    junit
 
 Provides:         bcprov = %{version}-%{release}
 
 %description
 The Bouncy Castle Crypto package is a Java implementation of cryptographic
-algorithms. The package is organised so that it contains a light-weight API
+algorithms. The package is organized so that it contains a light-weight API
 suitable for use in any environment (including the newly released J2ME) with
 the additional infrastructure to conform the algorithms to the JCE framework.
 
@@ -47,7 +47,7 @@ unzip -qq src.zip -d src/
 %build
 pushd src
   export CLASSPATH=$(build-classpath junit)
-  %javac -g -source 1.6 -target 1.6 -encoding UTF-8 $(find . -type f -name "*.java")
+  %javac -g -source 1.5 -target 1.5 -encoding UTF-8 $(find . -type f -name "*.java")
   jarfile="../bcprov.jar"
   # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
   files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
@@ -154,6 +154,11 @@ fi
 %{_javadocdir}/%{name}/
 
 %changelog
+* Wed Feb 26 2014 Michal Srb <msrb at redhat.com> - 1.50-2
+- Fix java BR/R
+- Build with -source/target 1.5
+- s/organised/organized/
+
 * Fri Feb 21 2014 Michal Srb <msrb at redhat.com> - 1.50-1
 - Update to upstream version 1.50
 - Switch to java-headless


More information about the scm-commits mailing list