[libzfcphbaapi] - updated to 2.1.1

[Dan Horák]

commit c9ab4d205c3fdf1ae775e919e4cf878520235841
Author: Dan Horák <dan at danny.cz>
Date:   Fri Mar 14 15:43:12 2014 +0100

    - updated to 2.1.1

 .gitignore                                         |    1 +
 lib-zfcp-hbaapi-2.1-HBA_FreeLibrary.patch          |   69 ---------
 ...aapi-2.1-find-sg-without-sysfs-deprecated.patch |   48 ------
 lib-zfcp-hbaapi-2.1-parse-u64-as-ull.patch         |  158 --------------------
 lib-zfcp-hbaapi-2.1-vendorlib.patch                |   37 -----
 lib-zfcp-hbaapi-2.1.1-fedora.patch                 |   41 +++++
 libzfcphbaapi.spec                                 |   38 ++---
 sources                                            |    2 +-
 8 files changed, 56 insertions(+), 338 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 2a312b7..ca40a74 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 /lib-zfcp-hbaapi-2.1.tar.gz
+/lib-zfcp-hbaapi-2.1.1.tar.gz
diff --git a/lib-zfcp-hbaapi-2.1.1-fedora.patch b/lib-zfcp-hbaapi-2.1.1-fedora.patch
new file mode 100644
index 0000000..42489b4
--- /dev/null
+++ b/lib-zfcp-hbaapi-2.1.1-fedora.patch
@@ -0,0 +1,41 @@
+From 0cc72f0d807a71e0fdc67d04e0b86b98282db644 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan at danny.cz>
+Date: Wed, 29 Jan 2014 14:27:27 +0100
+Subject: [PATCH] build the library as a module
+
+---
+ Makefile.am | 4 ++++
+ Makefile.in | 2 ++
+ 2 files changed, 6 insertions(+)
+
+diff --git a/Makefile.am b/Makefile.am
+index a9a040d..bddc86f 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -69,6 +69,10 @@ libzfcphbaapi_la_LDFLAGS = \
+ 	-Wl,-init,_initvlib,-fini,_finivlib \
+ 	-export-symbols $(SYMFILE)
+ 
++if VENDORLIB
++libzfcphbaapi_la_LDFLAGS += -module -avoid-version -release $(VERSION)
++endif
++
+ bin_PROGRAMS = zfcp_ping zfcp_show
+ 
+ zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
+diff --git a/Makefile.in b/Makefile.in
+index f459693..b9c7712 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -407,6 +407,8 @@ libzfcphbaapi_la_LDFLAGS = \
+ 	-Wl,-init,_initvlib,-fini,_finivlib \
+ 	-export-symbols $(SYMFILE)
+ 
++ at VENDORLIB_TRUE@libzfcphbaapi_la_LDFLAGS += -module -avoid-version -release $(VERSION)
++
+ zfcp_ping_SOURCES = fc_tools/zfcp_ping.c
+ zfcp_show_SOURCES = fc_tools/zfcp_show.c
+ @VENDORLIB_FALSE at zfcp_ping_LDADD = -lzfcphbaapi
+-- 
+1.8.5.3
+
diff --git a/libzfcphbaapi.spec b/libzfcphbaapi.spec
index 6b5104b..c1b5211 100644
--- a/libzfcphbaapi.spec
+++ b/libzfcphbaapi.spec
@@ -3,12 +3,14 @@
 Name:           libzfcphbaapi
 Summary:        HBA API for the zFCP device driver
 Group:          System Environment/Libraries
-Version:        2.1
-Release:        3%{?dist}
+Version:        2.1.1
+Release:        1%{?dist}
 License:        CPL
 URL:            http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi.html
 # http://www.ibm.com/developerworks/linux/linux390/zfcp-hbaapi-%%{hbaapiver}.html
 Source0:        http://download.boulder.ibm.com/ibmdl/pub/software/dw/linux390/ht_src/%{srcname}-%{version}.tar.gz
+Patch1:         %{srcname}-2.1.1-fedora.patch
+
 ExclusiveArch:  s390 s390x
 
 BuildRequires:  automake
@@ -25,17 +27,6 @@ Obsoletes:      s390utils-libzfcphbaapi <= 2:1.20.0-3
 # exclude plugin soname from Provides
 %global __provides_exclude ^(libzfcphbaapi-%{version}[.]so.*)$
 
-# build the library as a module
-Patch1:         %{srcname}-2.1-module.patch
-# fix linking of the tools when using vendor library mode
-Patch2:         %{srcname}-2.1-vendorlib.patch
-# fix crash on HBA_FreeLibrary call (#713817)
-Patch3:         %{srcname}-2.1-HBA_FreeLibrary.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=951586
-Patch4:         %{srcname}-2.1-parse-u64-as-ull.patch
-# https://bugzilla.redhat.com/show_bug.cgi?id=949099
-Patch5:         %{srcname}-2.1-find-sg-without-sysfs-deprecated.patch
-
 %description
 zFCP HBA API Library is an implementation of FC-HBA (see www.t11.org) for
 the zFCP device driver.
@@ -57,14 +48,7 @@ Documentation for the zFCP HBA API Library.
 %prep
 %setup -q -n %{srcname}-%{version}
 
-%patch1 -p1 -b .module
-%patch2 -p1 -b .vendorlib
-%patch3 -p2 -b .HBA_FreeLibrary
-%patch4 -p2 -b .parse-as-ull
-%patch5 -p2 -b .find-sg
-
-# lib-zfcp-hbaapi: fix perms
-chmod a-x *.h AUTHORS README ChangeLog LICENSE
+%patch1 -p1 -b .fedora
 
 
 %build
@@ -73,9 +57,9 @@ make EXTRA_CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
 
 
 %install
-%makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
+%makeinstall docdir=$RPM_BUILD_ROOT%{_docdir}/%{name}
 # keep only html docs
-rm -rf $RPM_BUILD_ROOT%{_docdir}/%{srcname}-%{version}/latex
+rm -rf $RPM_BUILD_ROOT%{_docdir}/%{name}/latex
 # remove unwanted files
 rm -f $RPM_BUILD_ROOT%{_libdir}/%{name}.*
 
@@ -102,13 +86,17 @@ grep -q -e "^libzfcphbaapi" /etc/hba.conf &&
 %{_mandir}/man8/zfcp_ping.8*
 %{_mandir}/man8/zfcp_show.8*
 %exclude %{_mandir}/man3/hbaapi.h.3*
+%exclude %{_docdir}/%{name}/html
+
 
 %files docs
-%docdir %{_docdir}/%{name}-%{version}
-%{_docdir}/%{name}-%{version}/
+%{_docdir}/%{name}/html
 
 
 %changelog
+* Fri Mar 14 2014 Dan Horák <dan[at]danny.cz> - 2.1.1-1
+- updated to 2.1.1
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.1-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 88dbc11..1fa607b 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ecf3ff0ac4469db7297ebd6f7607fb48  lib-zfcp-hbaapi-2.1.tar.gz
+5031c6620bf5c6be6a69851ba5685971  lib-zfcp-hbaapi-2.1.1.tar.gz