[bouncycastle] Resolves: rhbz#966051 Revert "1.48"

[Caolán McNamara]

commit e7a9bac6da97406243cffbd7a49452f7afff1694
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed May 29 14:09:01 2013 +0100

    Resolves: rhbz#966051 Revert "1.48"
    
    bouncycastle, bouncycastle-mail and bouncycastle-tsp all
    have to be at the same version. If bouncycastle is bumped
    to 1.48 then bouncycastle-mail 1.48 requires a new build
    dependency package of "bcpkix" to be available first
    
    This reverts commit 3750535f316da77b966942871d43a3f49c137e11.

 .gitignore                                       |    1 -
 bcprov-jdk15on-1.48.pom => bcprov-jdk16-1.46.pom |   15 ++++-----------
 bouncycastle.spec                                |   11 ++++-------
 sources                                          |    2 +-
 4 files changed, 9 insertions(+), 20 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6245820..b54d5f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 bcprov-jdk16-145-FEDORA.tar.gz
 /bcprov-jdk16-146-FEDORA.tar.gz
-/bcprov-jdk15on-148.tar.gz
diff --git a/bcprov-jdk15on-1.48.pom b/bcprov-jdk16-1.46.pom
similarity index 69%
rename from bcprov-jdk15on-1.48.pom
rename to bcprov-jdk16-1.46.pom
index d5ff7a4..cfe4088 100644
--- a/bcprov-jdk15on-1.48.pom
+++ b/bcprov-jdk16-1.46.pom
@@ -2,11 +2,11 @@
 <project>
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.bouncycastle</groupId>
-  <artifactId>bcprov-jdk15on</artifactId>
+  <artifactId>bcprov-jdk16</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle Provider</name>
-  <version>1.48</version>
-  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.5 to JDK 1.7.</description>
+  <version>1.46</version>
+  <description>The Bouncy Castle Crypto package is a Java implementation of cryptographic algorithms. This jar contains JCE provider and lightweight API for the Bouncy Castle Cryptography APIs for JDK 1.6.</description>
   <url>http://www.bouncycastle.org/java.html</url>
   <licenses>
     <license>
@@ -18,11 +18,4 @@
   <scm>
     <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
   </scm>
-  <developers>
-    <developer>
-      <id>feedback-crypto</id>
-      <name>The Legion of the Bouncy Castle</name>
-      <email>feedback-crypto at bouncycastle.org</email>
-    </developer>
-  </developers>
-</project>
+</project>
\ No newline at end of file
diff --git a/bouncycastle.spec b/bouncycastle.spec
index c56b3ed..bce6107 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,17 +1,17 @@
-%global ver  1.48
-%global archivever  jdk15on-%(echo %{ver}|sed 's|\\\.||')
+%global ver  1.46
+%global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
 %global classname   org.bouncycastle.jce.provider.BouncyCastleProvider
 
 Summary:          Bouncy Castle Crypto Package for Java
 Name:             bouncycastle
 Version:          %{ver}
-Release:          1%{?dist}
+Release:          7%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.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-jdk15on/%{version}/bcprov-jdk15on-%{version}.pom
+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
@@ -165,9 +165,6 @@ fi
 %{_javadocdir}/%{name}/
 
 %changelog
-* Thu Feb 21 2013 Tom Callaway <spot at fedoraproject.org> - 1.48-1
-- update to 1.48
-
 * Wed Feb 13 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.46-7
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 24dbe2e..891dd88 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ac662124410ffef3686bd936530e758d  bcprov-jdk15on-148.tar.gz
+944374e9b57c9f7f6751d9c65ff62374  bcprov-jdk16-146.tar.gz