[bouncycastle-mail] Import Bouncy Castle 1.46. Drop gcj.

[Orcan Ogetbil]

commit 81938a80ca2b225dc6ce29972e0334bf65dc0bf3
Author: Orcan Ogetbil <oget.fedora at gmail.com>
Date:   Tue Mar 1 23:24:47 2011 -0500

    Import Bouncy Castle 1.46.
    Drop gcj.

 .gitignore                                     |    1 +
 bcmail-jdk16-1.45.pom => bcmail-jdk16-1.46.pom |    4 +-
 bouncycastle-mail.spec                         |   32 ++++-------------------
 sources                                        |    2 +-
 4 files changed, 10 insertions(+), 29 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 7da4f97..f1de422 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 bcmail-jdk16-145-FEDORA.tar.gz
+/bcmail-jdk16-146-FEDORA.tar.gz
diff --git a/bcmail-jdk16-1.45.pom b/bcmail-jdk16-1.46.pom
similarity index 94%
rename from bcmail-jdk16-1.45.pom
rename to bcmail-jdk16-1.46.pom
index b00146e..9397d23 100644
--- a/bcmail-jdk16-1.45.pom
+++ b/bcmail-jdk16-1.46.pom
@@ -5,7 +5,7 @@
   <artifactId>bcmail-jdk16</artifactId>
   <packaging>jar</packaging>
   <name>Bouncy Castle CMS and S/MIME API</name>
-  <version>1.45</version>
+  <version>1.46</version>
   <description>The Bouncy Castle Java CMS and S/MIME APIs for handling the CMS and S/MIME protocols. This jar contains CMS and S/MIME APIs for JDK 1.6. The APIs can be used in conjunction with a JCE/JCA provider such as the one provided with the Bouncy Castle Cryptography APIs. If the S/MIME API is used, the JavaMail API and the Java activation framework will also be needed.</description>
   <url>http://www.bouncycastle.org/java.html</url>
   <licenses>
@@ -22,7 +22,7 @@
     <dependency>
       <groupId>org.bouncycastle</groupId>
       <artifactId>bcprov-jdk16</artifactId>
-      <version>1.45</version>
+      <version>1.46</version>
       <type>jar</type>
     </dependency>
   </dependencies>
diff --git a/bouncycastle-mail.spec b/bouncycastle-mail.spec
index fe7a42b..b6bb568 100644
--- a/bouncycastle-mail.spec
+++ b/bouncycastle-mail.spec
@@ -1,11 +1,10 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%global ver  1.45
+%global ver  1.46
 %global archivever  jdk16-%(echo %{ver}|sed 's|\\\.||')
 
 Summary:          S/MIME and CMS libraries for Bouncy Castle
 Name:             bouncycastle-mail
 Version:          %{ver}
-Release:          2%{?dist}
+Release:          1%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.bouncycastle.org/
@@ -21,14 +20,7 @@ BuildRequires:    jpackage-utils >= 1.5
 Requires:         jpackage-utils >= 1.5
 Requires(post):   jpackage-utils >= 1.7
 Requires(postun): jpackage-utils >= 1.7
-%if %{with_gcj}
-Requires:         java-1.5.0-gcj
-Requires(post):   java-gcj-compat
-Requires(postun): java-gcj-compat
-BuildRequires:    java-gcj-compat-devel
-%else
 BuildArch:        noarch
-%endif
 BuildRequires:    bouncycastle == %{version}
 BuildRequires:    java-devel >= 1.7
 Requires:         java >= 1.7
@@ -89,9 +81,6 @@ install -dm 755 $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
 pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
   ln -sf ../bcmail-%{version}.jar bcmail-%{version}.jar
 popd
-%if %{with_gcj}
-  %{_bindir}/aot-compile-rpm
-%endif
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -114,19 +103,9 @@ popd
 
 %post
 %update_maven_depmap
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ]; then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 
 %postun
 %update_maven_depmap
-%if %{with_gcj}
-  if [ -x %{_bindir}/rebuild-gcj-db ]; then
-    %{_bindir}/rebuild-gcj-db
-  fi
-%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -139,15 +118,16 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadir}/gcj-endorsed/bcmail-%{version}.jar
 %{_mavenpomdir}/JPP-bcmail.pom
 %{_mavendepmapfragdir}/%{name}
-%if %{with_gcj}
-  %{_libdir}/gcj/%{name}/
-%endif
 
 %files javadoc
 %defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Tue Mar 01 2011 Orcan Ogetbil <oget [DOT] fedora [AT] gmail [DOT] com> - 1.46-1
+- Import Bouncy Castle 1.46.
+- Drop gcj.
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.45-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 69fe9b7..7f2868a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-fe9998ee851381a97f9100de0b92f54b  bcmail-jdk16-145-FEDORA.tar.gz
+d7b27678d5fdebaf79a19ef34ae9d9b3  bcmail-jdk16-146-FEDORA.tar.gz