diff --git a/0013-disable-ld_iscsi.patch b/0013-disable-ld_iscsi.patch index d879f71..36a5485 100644 --- a/0013-disable-ld_iscsi.patch +++ b/0013-disable-ld_iscsi.patch @@ -2,12 +2,12 @@ diff --git a/configure.ac b/configure.ac index e1d01c6..72a5019 100644 --- a/configure.ac +++ b/configure.ac -@@ -9,7 +9,7 @@ LT_INIT +@@ -118,7 +118,7 @@ + fi + AM_CONDITIONAL(ISCSITEST, [test "$ac_cv_have_cunit" = yes -a "$enable_shared" = "yes"]) - AC_CANONICAL_HOST - AM_CONDITIONAL(LD_ISCSI, -- [expr "$host_os" : linux > /dev/null 2>&1]) -+ [false]) - AM_PROG_CC_C_O +-AM_CONDITIONAL(LD_ISCSI, [expr "(" "$host_os" : "linux" ")" "&" "$enable_shared" "=" "yes"]) ++AM_CONDITIONAL(LD_ISCSI, [false]) - enable_write_strings="yes" + AC_CHECK_MEMBER([struct CU_SuiteInfo.pSetUpFunc], + [AC_DEFINE([HAVE_CU_SUITEINFO_PSETUPFUNC], 1, diff --git a/libiscsi.spec b/libiscsi.spec index be6922a..74768b1 100644 --- a/libiscsi.spec +++ b/libiscsi.spec @@ -1,15 +1,13 @@ Name: libiscsi Summary: iSCSI client library -Version: 1.11.0 -Release: 3%{?dist} +Version: 1.15.0 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries URL: https://github.com/sahlberg/%{name} -Source: https://github.com/downloads/sahlberg/%{name}/%{name}-%{version}.tar.gz -Patch12: 0012-bump-soname.patch +Source: https://github.com/sahlberg/%{name}/archive/%{version}.tar.gz Patch13: 0013-disable-ld_iscsi.patch -Patch20: 0020-reconnect-fix.patch BuildRequires: autoconf BuildRequires: automake @@ -32,9 +30,7 @@ a network. %prep %setup -q -%patch12 -p1 %patch13 -p1 -%patch20 -p1 %build sh autogen.sh @@ -77,6 +73,7 @@ to iSCSI servers without having to set up the Linux iSCSI initiator. %{_bindir}/iscsi-inq %{_bindir}/iscsi-readcapacity16 %{_bindir}/iscsi-swp +%{_bindir}/iscsi-perf %{_bindir}/iscsi-test-cu %{_mandir}/man1/iscsi-ls.1.gz %{_mandir}/man1/iscsi-inq.1.gz @@ -100,6 +97,13 @@ The libiscsi-devel package includes the header files for libiscsi. %{_libdir}/pkgconfig/libiscsi.pc %changelog +* Sat May 16 2015 Neal Gompa - 1.15.0-1 +- Rebased to version 1.15.0 +- Removed patch 20 as it has been upstreamed +- Disabled patch 12 as need for revised one is in question +- Updated patch 13 to current tree +- New tool iscsi-perf + * Wed Jun 17 2015 Fedora Release Engineering - 1.11.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild