[libica] updated to 2.1.0 with soname set back to 2.0

[Dan Horák]

commit 928359738fd681d25cb6c63467b31ed1f35554f7
Author: Dan Horák <dan at danny.cz>
Date:   Thu Jul 7 12:06:36 2011 +0200

    updated to 2.1.0 with soname set back to 2.0

 .gitignore                       |    1 +
 libica-2.0.3-remove-sigill.patch |  275 --------------------------------------
 libica-2.1-version.patch         |   40 ++++++
 libica.spec                      |   16 +-
 sources                          |    2 +-
 5 files changed, 50 insertions(+), 284 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 32870cd..ebcc216 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 libica-2.0.3.tar.gz
 /libica-2.0.4.tar.gz
 /libica-2.0.6.tar.gz
+/libica-2.1.0.tar.gz
diff --git a/libica-2.1-version.patch b/libica-2.1-version.patch
new file mode 100644
index 0000000..7ea01a6
--- /dev/null
+++ b/libica-2.1-version.patch
@@ -0,0 +1,40 @@
+From 40d49d04da662c8ef27959fd50af51aa606e8046 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Mon, 4 Jul 2011 17:19:28 +0200
+Subject: [PATCH] use a new variable for tracking the API version
+
+---
+ configure.in    |    3 +++
+ src/Makefile.am |    2 +-
+ 2 files changed, 4 insertions(+), 1 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index fc67245..663075f 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,9 @@
+ 
+ AC_INIT(libica, 2.1.0, hd at linux.vnet.ibm.com)
+ 
++LIBICA_API=2.0
++AC_SUBST(LIBICA_API)
++
+ cmdline_CFLAGS="$CFLAGS"
+ 
+ # Compute $target
+diff --git a/src/Makefile.am b/src/Makefile.am
+index f1873b3..5903f27 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -2,7 +2,7 @@ INCLUDES = -I ./include -I ../include
+ 
+ lib_LTLIBRARIES = libica.la
+ 
+-libica_la_LDFLAGS = -release $(PACKAGE_VERSION) -lrt -lcrypto
++libica_la_LDFLAGS = -release $(LIBICA_API) -lrt -lcrypto
+ 
+ libica_la_SOURCES = icalinux.c ica_api.c init.c icastats_shared.c \
+ 		    s390_rsa.c s390_crypto.c s390_des.c \
+-- 
+1.7.4.4
+
diff --git a/libica.spec b/libica.spec
index e106a04..0790b7e 100644
--- a/libica.spec
+++ b/libica.spec
@@ -1,13 +1,13 @@
 Summary: Library for accessing ICA hardware crypto on IBM zSeries
 Name: libica
-Version: 2.0.6
+Version: 2.1.0
 Release: 1%{?dist}
 License: CPL
 Group: System Environment/Libraries
 URL: http://sourceforge.net/projects/opencryptoki/
 Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tar.gz
-# https://bugzilla.redhat.com/show_bug.cgi?id=624005
-Patch1: %{name}-2.0.3-tests.patch
+# soname backwards compatibility
+Patch0: %{name}-2.1-version.patch
 Buildroot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: openssl-devel
 BuildRequires: autoconf automake libtool
@@ -33,16 +33,13 @@ IBM zSeries.
 
 
 %prep
-%setup -q -n %{name}-2.0
+%setup -q -n %{name}-2.1
 
-%patch1 -p1 -b .tests
+%patch0 -p1 -b .version
 
 # fix EOLs
 sed -i -e 's/\r//g' LICENSE
 
-# update the version used in library name
-sed -i -e 's/2\.0\.6/2\.0/' configure.in
-
 sh ./bootstrap.sh
 
 
@@ -82,6 +79,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Thu Jul 07 2011 Dan Horák <dan[at]danny.cz> - 2.1.0-1
+- updated to 2.1.0 with soname set back to 2.0
+
 * Mon Apr 11 2011 Dan Horák <dan[at]danny.cz> - 2.0.6-1
 - updated to 2.0.6
 
diff --git a/sources b/sources
index 7edeb34..3ecaabc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-a65988fd7e58b3e98989d188ea5fa9ae  libica-2.0.6.tar.gz
+53a350f038877a58f8f6a3c02a6c2715  libica-2.1.0.tar.gz