From c8b36d6ec5a100532cedc486b3a8de1d96cdb9cdb77a6c7250e931388794beb0 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Mon, 18 Nov 2019 23:39:07 +0000 Subject: [PATCH] Accepting request 749403 from home:lee_duncan:branches:network New version of open-iscsi from upstream: 2.1.0. OBS-URL: https://build.opensuse.org/request/show/749403 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=151 --- open-iscsi-2.1.0-suse.tar.bz2 | 4 ++-- open-iscsi-SUSE-latest.diff.bz2 | 4 ++-- open-iscsi.changes | 9 +++------ open-iscsi.spec | 25 +++++++++++++------------ 4 files changed, 20 insertions(+), 22 deletions(-) diff --git a/open-iscsi-2.1.0-suse.tar.bz2 b/open-iscsi-2.1.0-suse.tar.bz2 index e27079a..12b1cd9 100644 --- a/open-iscsi-2.1.0-suse.tar.bz2 +++ b/open-iscsi-2.1.0-suse.tar.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:db378d808e09665cb72762e8297d91297e166aedbf439b1c89563d78565a6536 -size 478014 +oid sha256:db548401a533671350bf0420431e6b36c78cbcb1b482df363a5eecfb8cfb1f49 +size 477941 diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index 04c7a41..1f82a91 100644 --- a/open-iscsi-SUSE-latest.diff.bz2 +++ b/open-iscsi-SUSE-latest.diff.bz2 @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:657981107099f3052c0efe2b4d65553298c0407e57411be2bcb8b9a624ff747b -size 305 +oid sha256:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058 +size 14 diff --git a/open-iscsi.changes b/open-iscsi.changes index 74aebb2..4d5207e 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,19 +1,16 @@ ------------------------------------------------------------------- -Thu Nov 14 20:53:57 UTC 2019 - Lee Duncan +Mon Nov 18 17:42:09 UTC 2019 - Lee Duncan - Merged in latest upstream (2.1.0), including more fixes for iscsiuio, and cleanup/bug-fixes of new CHAP code. This replaces open-iscsi-2.0.878-suse.tar.bz2 with open-iscsi-2.1.0-suse.tar.bz2, and it resets open-iscsi-SUSE-latest.diff.bz2 with fixes after 2.1.0-suse. - Note that this also updates the version of libopeniscsiusr, - since the version numbers of it and open-iscsi are - kept in sync. Lastly, the libopeniscsiusr sub-package - updates the library version from 0_2_0 to 0_2_1. Also, updated the Summary lines in the spec file that started with "iSCSI ...", since rpmlint didn't like - them starting with a non-capital letter. + them starting with a non-capital letter, and updated the + version number for iscsiuio to match the code. ------------------------------------------------------------------- Sat Nov 9 17:44:09 UTC 2019 - Lee Duncan diff --git a/open-iscsi.spec b/open-iscsi.spec index 9bbd1bb..68ca567 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -17,7 +17,8 @@ %define iscsi_minor_release 1 -%define iscsi_patch_release 0-suse +%define iscsi_patch_release 0 +%define iscsi_patch_release_suse %{iscsi_patch_release}-suse Name: open-iscsi Version: 2.1.0 Release: 0 @@ -25,7 +26,7 @@ Summary: Linux iSCSI Software Initiator License: GPL-2.0-or-later Group: Productivity/Networking/Other Url: http://www.open-iscsi.com -Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release}.tar.bz2 +Source: %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse}.tar.bz2 Patch1: %{name}-SUSE-latest.diff.bz2 BuildRequires: autoconf BuildRequires: automake @@ -44,7 +45,7 @@ BuildRequires: suse-module-tools BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(systemd) Requires(post): coreutils -Requires: libopeniscsiusr0_2_1 = %{version} +Requires: libopeniscsiusr0_2_0 = %{version} %{?systemd_requires} %description @@ -62,14 +63,14 @@ connection-level error processing, Nop-In and Nop-Out handling. It comes with a daemon process called iscsid, and a management utility, iscsiadm. -%package -n libopeniscsiusr0_2_1 -Version: 2.1.0 +%package -n libopeniscsiusr0_2_0 +Version: 2.%{iscsi_minor_release}.%{iscsi_patch_release} Release: 0 Summary: The iSCSI User-level Library Group: System/Libraries -Obsoletes: libopeniscsiusr0_2_0 +Obsoletes: libopeniscsiusr0_1_0 -%description -n libopeniscsiusr0_2_1 +%description -n libopeniscsiusr0_2_0 The iSCSI user-space API from the open-iscsi project. %package -n iscsiuio @@ -95,7 +96,7 @@ The communication to the driver is done via user-space I/O (Kernel module name "uio"). %package devel -Version: 2.0.878 +Version: 2.%{iscsi_minor_release}.%{iscsi_patch_release} Release: 0 Summary: The iSCSI User-level Library Development Library and Include files Group: Development/Libraries/C and C++ @@ -107,7 +108,7 @@ include files and documentation. These are used to compile against the libopeniscsiusr library. %prep -%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release} +%setup -q -n %{name}-2.%{iscsi_minor_release}.%{iscsi_patch_release_suse} %patch1 -p1 %build @@ -155,8 +156,8 @@ fi %preun %{service_del_preun iscsid.socket iscsid.service iscsi.service} -%post -n libopeniscsiusr0_2_1 -p /sbin/ldconfig -%postun -n libopeniscsiusr0_2_1 -p /sbin/ldconfig +%post -n libopeniscsiusr0_2_0 -p /sbin/ldconfig +%postun -n libopeniscsiusr0_2_0 -p /sbin/ldconfig %post -n iscsiuio %{service_add_post iscsiuio.socket iscsiuio.service} @@ -201,7 +202,7 @@ fi %{_mandir}/man8/iscsi_fw_login.8%{ext_man} %{_udevrulesdir}/50-iscsi-firmware-login.rules -%files -n libopeniscsiusr0_2_1 +%files -n libopeniscsiusr0_2_0 %{_libdir}/libopeniscsiusr.so.* %files -n iscsiuio