[bouncycastle] Revert "update to 1.47, use pristine sources from here on out"

[Orcan Ogetbil]

commit 97c84f9f748f61ae78e8a5a3620d8ce51b4508a7
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue May 8 22:47:26 2012 -0400

    Revert "update to 1.47, use pristine sources from here on out"
    
    This reverts commit 9b4f3d3ee566441d04fbb516c9f4a553f9b196ee.
    See bug#806262

 .gitignore                                       |    1 -
 bcprov-jdk15on-1.47.pom => bcprov-jdk16-1.46.pom |    8 ++++----
 bouncycastle.spec                                |   18 +++++++++---------
 sources                                          |    2 +-
 4 files changed, 14 insertions(+), 15 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 1a78793..b54d5f0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
 bcprov-jdk16-145-FEDORA.tar.gz
 /bcprov-jdk16-146-FEDORA.tar.gz
-/bcprov-jdk15on-147.tar.gz
diff --git a/bcprov-jdk15on-1.47.pom b/bcprov-jdk16-1.46.pom
similarity index 85%
rename from bcprov-jdk15on-1.47.pom
rename to bcprov-jdk16-1.46.pom
index 05256f0..cfe4088 100644
--- a/bcprov-jdk15on-1.47.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.47</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,4 +18,4 @@
   <scm>
     <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
   </scm>
-</project>
+</project>
\ No newline at end of file
diff --git a/bouncycastle.spec b/bouncycastle.spec
index eaa593c..9129a74 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,17 +1,20 @@
-%global ver  1.47
-%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:          4%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
-# Note: Original source is now okay to use.
-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
+# Original source http://www.bouncycastle.org/download/bcprov-%{archivever}.tar.gz
+# is modified to
+# bcprov-%{archivever}-FEDORA.tar.gz with patented algorithms removed.
+# Specifically: IDEA algorithms got removed.
+Source0:          bcprov-%{archivever}-FEDORA.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
@@ -165,9 +168,6 @@ fi
 %{_javadocdir}/%{name}/
 
 %changelog
-* Tue May  8 2012 Tom Callaway <spot at fedoraproject.org> - 1.47-1
-- update to 1.47, use pristine source from here on.
-
 * Sat Feb 18 2012 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.46-4
 - Build with -source 1.6 -target 1.6 
 
diff --git a/sources b/sources
index 22cdfe5..de65d23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-baf95df6595968c3298bd0b39c2b784a  bcprov-jdk15on-147.tar.gz
+a522ba5ababb6505dbd474c3cb924d29  bcprov-jdk16-146-FEDORA.tar.gz