- updated to 1.19.0

- added link patch

diff --git a/libiscsi-link.patch b/libiscsi-link.patch
new file mode 100644 (file)
index 0000000..ecbb1d1
--- /dev/null
+++ b/libiscsi-link.patch
@@ -0,0 +1,27 @@
+--- libiscsi-1.19.0/lib/Makefile.am.orig       2019-07-14 00:04:44.000000000 +0200
++++ libiscsi-1.19.0/lib/Makefile.am    2019-10-19 20:13:59.679343733 +0200
+@@ -5,6 +5,7 @@
+       login.c nop.c pdu.c iscsi-command.c \
+       scsi-lowlevel.c socket.c sync.c task_mgmt.c \
+       logging.c
++libiscsi_la_LIBADD =
+ 
+ if !HAVE_LIBGCRYPT
+ libiscsi_la_SOURCES += md5.c
+@@ -12,6 +13,7 @@
+ 
+ if HAVE_LINUX_ISER
+ libiscsi_la_SOURCES += iser.c
++libiscsi_la_LIBADD += -lpthread
+ endif
+ 
+ SOCURRENT=9
+@@ -22,7 +24,7 @@
+       -no-undefined -export-symbols ${srcdir}/libiscsi.syms
+ 
+ if HAVE_LINUX_ISER
+-libiscsi_la_LDFLAGS += -libverbs -lrdmacm
++libiscsi_la_LIBADD += -libverbs -lrdmacm
+ endif
+ 
+ libiscsi_la_CPPFLAGS = -I${srcdir}/../include -I$(srcdir)/include \

diff --git a/libiscsi.spec b/libiscsi.spec
index 4945dca7fffd96d1be70709dbf57ee8dce43bda6..e04f90944cdc58b705bbb259f2187fc5753f6479 100644 (file)
--- a/libiscsi.spec
+++ b/libiscsi.spec
@@ -1,16 +1,20 @@
 Summary:       Clientside library to implement the iSCSI protocol
 Summary(pl.UTF-8):     Biblioteka kliencka implementująca protokół iSCSI
 Name:          libiscsi
-Version:       1.10.0
-Release:       3
+Version:       1.19.0
+Release:       1
 License:       LGPL v2.1+ (library), GPL v2+ (tools)
 Group:         Libraries
-#Source0Download: https://github.com/sahlberg/libiscsi/downloads
-Source0:       https://github.com/sahlberg/libiscsi/archive/%{version}.tar.gz?/%{name}-%{version}.tar.gz
-# Source0-md5: 650266b18b2516d32a5a0aa8027e06d3
+#Source0Download: https://github.com/sahlberg/libiscsi/releases
+Source0:       https://github.com/sahlberg/libiscsi/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: fe0c0c7b677f3b6fbe535e758838ccf2
+Patch0:                %{name}-link.patch
 URL:           https://github.com/sahlberg/libiscsi
 BuildRequires: autoconf >= 2.50
 BuildRequires: automake
+BuildRequires: libgcrypt-devel
+BuildRequires: libibverbs-devel
+BuildRequires: librdmacm-devel
 BuildRequires: libtool >= 2:2
 BuildRequires: popt-devel
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -32,30 +36,30 @@ SCSI, ale dostępna jest także warstwa synchroniczna ułatwiająca użycie
 w prostszych zastosowaniach.
 
 %package devel
-Summary:       Header files for %{name} library
-Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki %{name}
+Summary:       Header files for iSCSI library
+Summary(pl.UTF-8):     Pliki nagłówkowe biblioteki iSCSI
 License:       LGPL v2.1+
 Group:         Development/Libraries
 Requires:      %{name} = %{version}-%{release}
 
 %description devel
-Header files for %{name} library.
+Header files for iSCSI library.
 
 %description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki %{name}.
+Pliki nagłówkowe biblioteki iSCSI.
 
 %package static
-Summary:       Static %{name} library
-Summary(pl.UTF-8):     Statyczna biblioteka %{name}
+Summary:       Static iSCSI library
+Summary(pl.UTF-8):     Statyczna biblioteka iSCSI
 License:       LGPL v2.1+
 Group:         Development/Libraries
 Requires:      %{name}-devel = %{version}-%{release}
 
 %description static
-Static %{name} library.
+Static iSCSI library.
 
 %description static -l pl.UTF-8
-Statyczna biblioteka %{name}.
+Statyczna biblioteka iSCSI.
 
 %package tools
 Summary:       A handful of useful iSCSI utilities
@@ -74,6 +78,7 @@ wszystkich celów oraz urządzeń.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 %{__libtoolize}
@@ -104,7 +109,7 @@ rm -rf $RPM_BUILD_ROOT
 # COPYING specifies some details, doesn't contain LGPL/GPL text
 %doc COPYING README TODO
 %attr(755,root,root) %{_libdir}/libiscsi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libiscsi.so.3
+%attr(755,root,root) %ghost %{_libdir}/libiscsi.so.9
 
 %files devel
 %defattr(644,root,root,755)
@@ -120,9 +125,12 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/iscsi-inq
 %attr(755,root,root) %{_bindir}/iscsi-ls
-%attr(755,root,root) %{_bindir}/ld_iscsi.so
+%attr(755,root,root) %{_bindir}/iscsi-perf
 %attr(755,root,root) %{_bindir}/iscsi-readcapacity16
 %attr(755,root,root) %{_bindir}/iscsi-swp
+%attr(755,root,root) %{_bindir}/iscsi-test-cu
+%attr(755,root,root) %{_bindir}/ld_iscsi.so
 %{_mandir}/man1/iscsi-inq.1*
 %{_mandir}/man1/iscsi-ls.1*
 %{_mandir}/man1/iscsi-swp.1*
+%{_mandir}/man1/iscsi-test-cu.1*