[bouncycastle] Update to upstream version 1.50

[Michal Srb]

commit e411de81c0d2bb33b6686db65f397d21a4a083ae
Author: Michal Srb <msrb at redhat.com>
Date:   Mon Feb 24 09:12:08 2014 +0100

    Update to upstream version 1.50
    
    - Switch to java-headless

 .gitignore            |    2 ++
 bcprov-jdk16-1.46.pom |   21 ---------------------
 bouncycastle.spec     |   29 ++++++++++++++++-------------
 sources               |    3 ++-
 4 files changed, 20 insertions(+), 35 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index b54d5f0..754c479 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,4 @@
 bcprov-jdk16-145-FEDORA.tar.gz
 /bcprov-jdk16-146-FEDORA.tar.gz
+/bcprov-jdk15on-150.tar.gz
+/bcprov-jdk15on-1.50.pom
diff --git a/bouncycastle.spec b/bouncycastle.spec
index c7791bc..6ea730f 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,23 +1,23 @@
-%global ver  1.46
-%global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
-%global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
+%global ver 1.50
+%global archivever jdk15on-%(echo %{ver}|sed 's|\\\.||')
+%global classname org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          %{ver}
-Release:          12%{?dist}
+Release:          1%{?dist}
 License:          MIT
-URL:              http://www.%{name}.org/
+URL:              http://www.bouncycastle.org
 # Use original sources from here on out.
 Source0:          http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
-Source1:          http://repo2.maven.org/maven2/org/bouncycastle/bcprov-jdk16/%{version}/bcprov-jdk16-%{version}.pom
-BuildRequires:    jpackage-utils >= 1.5
-Requires:         jpackage-utils >= 1.5
-Requires(post):   jpackage-utils >= 1.7
-Requires(postun): jpackage-utils >= 1.7
+Source1:          http://repo1.maven.org/maven2/org/bouncycastle/bcprov-jdk15on/%{ver}/bcprov-jdk15on-%{ver}.pom
+BuildRequires:    javapackages-tools
+Requires:         javapackages-tools
+Requires(post):   javapackages-tools
+Requires(postun): javapackages-tools
 BuildArch:        noarch
 BuildRequires:    java-devel >= 1.7
-Requires:         java >= 1.7
+Requires:         java-headless >= 1.7
 BuildRequires:    junit
 
 Provides:         bcprov = %{version}-%{release}
@@ -30,7 +30,6 @@ the additional infrastructure to conform the algorithms to the JCE framework.
 
 %package javadoc
 Summary:        Javadoc for %{name}
-Requires:       %{name} = %{version}-%{release}
 
 %description javadoc
 API documentation for the %{name} package.
@@ -82,7 +81,7 @@ 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-bcprov.pom
-%add_maven_depmap -a bouncycastle:bcprov-jdk15 JPP-bcprov.pom bcprov.jar
+%add_maven_depmap -a "bouncycastle:bcprov-jdk15,org.bouncycastle:bcprov-jdk16" JPP-bcprov.pom bcprov.jar
 
 %check
 pushd src
@@ -155,6 +154,10 @@ fi
 %{_javadocdir}/%{name}/
 
 %changelog
+* Fri Feb 21 2014 Michal Srb <msrb at redhat.com> - 1.50-1
+- Update to upstream version 1.50
+- Switch to java-headless
+
 * Mon Jan  6 2014 Mikolaj Izdebski <mizdebsk at redhat.com> - 1.46-12
 - Add Maven alias for bouncycastle:bcprov-jdk15
 
diff --git a/sources b/sources
index 891dd88..05d156d 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-944374e9b57c9f7f6751d9c65ff62374  bcprov-jdk16-146.tar.gz
+9c949462f8ae1efd2bd12e032f3fb5b5  bcprov-jdk15on-150.tar.gz
+db5cecaed4c9d32af432407a22b17b51  bcprov-jdk15on-1.50.pom