[openssl-ibmca] update to 1.2.0

[Dan Horák]

commit b01b48287e2ead58a8c67f75e7077348b64cdee9
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jul 7 13:52:06 2011 +0200

    update to 1.2.0

 .gitignore                              |    1 +
 openssl-ibmca-1.1-libica-soname.patch   |   12 ------------
 openssl-ibmca-1.1-linking.patch         |   24 ------------------------
 openssl-ibmca-1.2.0-libica-soname.patch |   12 ++++++++++++
 openssl-ibmca.spec                      |   14 +++++++-------
 sources                                 |    2 +-
 6 files changed, 21 insertions(+), 44 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 6f18a3d..167aec7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 openssl-ibmca-1.1.tar.gz
+/openssl-ibmca-1.2.0.tar.gz
diff --git a/openssl-ibmca-1.2.0-libica-soname.patch b/openssl-ibmca-1.2.0-libica-soname.patch
new file mode 100644
index 0000000..ca68567
--- /dev/null
+++ b/openssl-ibmca-1.2.0-libica-soname.patch
@@ -0,0 +1,12 @@
+diff -up openssl-ibmca-1.2.0/e_ibmca.c.libica-soname openssl-ibmca-1.2.0/e_ibmca.c
+--- openssl-ibmca-1.2.0/e_ibmca.c.libica-soname	2011-05-02 19:50:50.000000000 +0200
++++ openssl-ibmca-1.2.0/e_ibmca.c	2011-05-04 20:57:50.000000000 +0200
+@@ -114,7 +114,7 @@ typedef struct ibmca_sha256_ctx {
+ } IBMCA_SHA256_CTX;
+ #endif
+ 
+-static const char *IBMCA_LIBNAME = "ica";
++static const char *IBMCA_LIBNAME = "ica-2.0";
+ 
+ #if defined(NID_aes_128_cfb128) && ! defined (NID_aes_128_cfb)
+ #define NID_aes_128_cfb NID_aes_128_cfb128
diff --git a/openssl-ibmca.spec b/openssl-ibmca.spec
index e413348..62e19b7 100644
--- a/openssl-ibmca.spec
+++ b/openssl-ibmca.spec
@@ -1,15 +1,13 @@
 Summary: A dynamic OpenSSL engine for IBMCA
 Name: openssl-ibmca
-Version: 1.1
-Release: 3%{?dist}
+Version: 1.2.0
+Release: 1%{?dist}
 License: OpenSSL
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/opencryptoki
 Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz
-# fix linking
-Patch0: openssl-ibmca-1.1-linking.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=584765
-Patch1: openssl-ibmca-1.1-libica-soname.patch
+Patch0: openssl-ibmca-1.2.0-libica-soname.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires: libica
 BuildRequires: libica-devel automake libtool
@@ -21,8 +19,7 @@ A dynamic OpenSSL engine for IBMCA crypto hardware on IBM zSeries machines.
 
 %prep
 %setup -q
-%patch0 -p1 -b .linking
-%patch1 -p1 -b .libica-soname
+%patch0 -p1 -b .libica-soname
 
 sh ./bootstrap.sh
 
@@ -52,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 07 2011 Dan Horák <dan[at]danny.cz - 1.2.0-1
+- update to 1.2.0
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 
diff --git a/sources b/sources
index 3b56641..418b1d0 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c94f2b5cbef6c78eefa49d71d0f4b972  openssl-ibmca-1.1.tar.gz
+df14df18d276ab3106dffb8b7623896a  openssl-ibmca-1.2.0.tar.gz