[libica] - updated to 2.4.2

[Dan Horák]

commit 999348398b655230f2ea910c32b0ebd0aa79507f
Author: Dan Horák <dan at danny.cz>
Date:   Tue Oct 14 08:37:21 2014 +0200

    - updated to 2.4.2

 .gitignore               |    1 +
 libica-2.3-fixes.patch   |   72 ----------------------------------------------
 libica-2.3-version.patch |   25 ----------------
 libica-2.4-version.patch |   40 +++++++++++++++++++++++++
 libica.spec              |   19 ++++++------
 sources                  |    2 +-
 6 files changed, 51 insertions(+), 108 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 652117f..a51eed9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,3 +5,4 @@ libica-2.0.3.tar.gz
 /libica-2.1.1.tar.gz
 /libica-2.2.0.tar.gz
 /libica-2.3.0.tar.gz
+/libica-2.4.2.tgz
diff --git a/libica-2.4-version.patch b/libica-2.4-version.patch
new file mode 100644
index 0000000..415c0d2
--- /dev/null
+++ b/libica-2.4-version.patch
@@ -0,0 +1,40 @@
+From 3edb86b1057f98bb70017f7998532c62e60ead12 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: [libica PATCH] use a new variable for tracking the API version
+
+---
+ configure.in    | 3 +++
+ src/Makefile.am | 2 +-
+ 2 files changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.in b/configure.in
+index 241ab0d..caa17bc 100644
+--- a/configure.in
++++ b/configure.in
+@@ -3,6 +3,9 @@
+ 
+ AC_INIT(libica, 2.4.0, ingo.tuchscherer 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 98fe2e8..df4ee1b 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 = -version-number 2:4:0 $(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_common.c s390_des.c \
+-- 
+1.9.3
+
diff --git a/libica.spec b/libica.spec
index f9005d4..c92e3c7 100644
--- a/libica.spec
+++ b/libica.spec
@@ -1,15 +1,13 @@
 Summary: Library for accessing ICA hardware crypto on IBM zSeries
 Name: libica
-Version: 2.3.0
-Release: 5%{?dist}
+Version: 2.4.2
+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
+Source0: http://downloads.sourceforge.net/opencryptoki/%{name}-%{version}.tgz
 # soname backwards compatibility
-Patch0: %{name}-2.3-version.patch
-# post-release fixes
-Patch1: %{name}-2.3-fixes.patch
+Patch0: %{name}-2.4-version.patch
 # fix build with recent kernels
 Patch2: %{name}-2.3-zcrypt.patch
 BuildRequires: openssl-devel
@@ -39,15 +37,11 @@ IBM zSeries.
 %setup -q -n %{name}-%{version}
 
 %patch0 -p1 -b .version
-%patch1 -p1 -b .fixes
 %patch2 -p1 -b .zcrypt
 
 # fix EOLs
 sed -i -e 's/\r//g' LICENSE
 
-# cleanup source archive
-rm src/*.o src/*.la
-
 sh ./bootstrap.sh
 
 
@@ -72,6 +66,8 @@ rm $RPM_BUILD_ROOT%{_libdir}/libica.la
 %{_bindir}/icainfo
 %{_bindir}/icastats
 %{_libdir}/libica-2.0.so
+%{_mandir}/man1/icainfo.1*
+%{_mandir}/man1/icastats.1*
 
 %files devel
 %{_includedir}/*
@@ -79,6 +75,9 @@ rm $RPM_BUILD_ROOT%{_libdir}/libica.la
 
 
 %changelog
+* Mon Sep 01 2014 Dan Horák <dan[at]danny.cz> - 2.4.2-1
+- updated to 2.4.2
+
 * Wed Jun 11 2014 Dan Horák <dan[at]danny.cz> - 2.3.0-5
 - fix build with recent kernels
 
diff --git a/sources b/sources
index 87f6cbe..3a7f2df 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-34a7226c36ff2b859d53ae895e483ee7  libica-2.3.0.tar.gz
+1b6b3cd69df6c6d33795ac34f05f1fa8  libica-2.4.2.tgz