[bouncycastle/el5] New upstream, rhbz#782849

[stevetraylen]

commit 495cc8069cb3635c574c28665d3a4cbecd73fd29
Author: Steve Traylen <steve.traylen at cern.ch>
Date:   Mon Jan 23 23:26:31 2012 +0100

    New upstream, rhbz#782849

 .gitignore            |    2 +-
 bcprov-jdk16-1.46.pom |   21 +++++++++++++++++++++
 bouncycastle.spec     |   29 +++++++++--------------------
 sources               |    2 +-
 4 files changed, 32 insertions(+), 22 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 3093709..9cf87b9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-bcprov-jdk16-145-FEDORA.tar.gz
+bcprov-jdk16-146-FEDORA.tar.gz
diff --git a/bcprov-jdk16-1.46.pom b/bcprov-jdk16-1.46.pom
new file mode 100644
index 0000000..67c8572
--- /dev/null
+++ b/bcprov-jdk16-1.46.pom
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project>
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.bouncycastle</groupId>
+  <artifactId>bcprov-jdk16</artifactId>
+  <packaging>jar</packaging>
+  <name>Bouncy Castle Provider</name>
+  <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>
+      <name>Bouncy Castle Licence</name>
+      <url>http://www.bouncycastle.org/licence.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <scm>
+    <url>http://www.bouncycastle.org/viewcvs/viewcvs.cgi/java</url>
+  </scm>
+</project>
diff --git a/bouncycastle.spec b/bouncycastle.spec
index 15463fe..80fbd46 100644
--- a/bouncycastle.spec
+++ b/bouncycastle.spec
@@ -1,12 +1,11 @@
-%global with_gcj %{!?_without_gcj:1}%{?_without_gcj:0}
-%global ver  1.45
+%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:          6%{?dist}
+Release:          1%{?dist}
 Group:            System Environment/Libraries
 License:          MIT
 URL:              http://www.%{name}.org/
@@ -20,7 +19,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}
+%if 0%{?with_gcj}
 Requires:         java-gcj
 Requires(post):   java-gcj-compat
 Requires(postun): java-gcj-compat
@@ -70,6 +69,8 @@ pushd src
   # Exclude all */test/* files except org.bouncycastle.util.test, cf. upstream
   files="$(find . -type f \( -name '*.class' -o -name '*.properties' \) -not -path '*/test/*')"
   files="$files $(find . -type f -path '*/org/bouncycastle/util/test/*.class')"
+  files="$files $(find . -type f -path '*/org/bouncycastle/jce/provider/test/*.class')"
+  files="$files $(find . -type f -path '*/org/bouncycastle/ocsp/test/*.class')"
   test ! -d classes && mf="" \
     || mf="`find classes/ -type f -name "*.mf" 2>/dev/null`"
   test -n "$mf" && jar cvfm $jarfile $mf $files \
@@ -93,9 +94,6 @@ popd
   pushd $RPM_BUILD_ROOT%{_javadir}/gcj-endorsed
     ln -sf ../bcprov-%{version}.jar bcprov-%{version}.jar
   popd
-%if %{with_gcj}
-  %{_bindir}/aot-compile-rpm
-%endif
 
 # javadoc
 mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
@@ -134,7 +132,7 @@ popd
   done
 } || :
 
-%if %{with_gcj}
+%if 0%{?with_gcj}
   if [ -x %{_bindir}/rebuild-gcj-db ]; then
     %{_bindir}/rebuild-gcj-db
   fi
@@ -164,26 +162,14 @@ if [ $1 -eq 0 ] ; then
     done
   } || :
 
-  %if %{with_gcj}
-    if [ -x %{_bindir}/rebuild-gcj-db ]; then
-      %{_bindir}/rebuild-gcj-db
-    fi
-  %endif
-
 fi
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-,root,root,-)
 %doc *.html
 %{_javadir}/bcprov.jar
 %{_javadir}/bcprov-%{version}.jar
   %{_javadir}/gcj-endorsed/bcprov-%{version}.jar
-%if %{with_gcj}
-  %{_libdir}/gcj/%{name}/
-%endif
 %{_sysconfdir}/java/security/security.d/2000-%{classname}
 
 %files javadoc
@@ -191,6 +177,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_javadocdir}/%{name}/
 
 %changelog
+* Mon Jan 23 2011 Steve Traylen <steve.traylen at cern.ch> - 1.46-1
+- New upstream, rhbz#782849
+
 * Wed Mar 10 2010 Steve Traylen <steve.traylen at cern.ch> - 1.45-6
 - Add back ExcludeArch pps, was a mistake it was removed.
 * Wed Mar 10 2010 Steve Traylen <steve.traylen at cern.ch> - 1.45-5
diff --git a/sources b/sources
index e84f3a5..de65d23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c6c3f41acb33da1bacb1a39b23caa097  bcprov-jdk16-145-FEDORA.tar.gz
+a522ba5ababb6505dbd474c3cb924d29  bcprov-jdk16-146-FEDORA.tar.gz