Accepting request 644428 from network

OBS-URL: https://build.opensuse.org/request/show/644428
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/open-iscsi?expand=0&rev=76

open-iscsi-2.0.876-suse.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8cf36ce1238f36baeb9e3b875ef00d559ac08fa0a90960e3c25fa93d2e8cd07e
-size 459832

open-iscsi-2.0.877-suse.tar.bz2

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1675661a506a0ed825876f8777885ffe12c8f91fdc2c58c7408cad7914032b74
+size 476653

open-iscsi-SUSE-latest.diff.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:7205bafc4ba161688f633a6986db7c8c95542355dba5bb3289ddc54f400e886a
+oid sha256:d3dda84eb03b9738d118eb2be78e246106900493c0ae07819ad60815134a8058
-size 41289
+size 14

open-iscsi.changes

@@ -1,3 +1,27 @@
+-------------------------------------------------------------------
+Wed Oct 24 19:06:27 UTC 2018 - lduncan@suse.com
+
+- Updated SPEC file with Obsoletes for library, and disclaimer
+  abot updating SPEC file directly.
+
+  Also, added using KBUILD_BUILD_TIMESTAMP to create reproducable
+  man pages (bsc#1047218)
+
+-------------------------------------------------------------------
+Wed Oct 17 18:23:30 UTC 2018 - lduncan@suse.com
+
+- Upgraded to upstream open-iscsi version 2.0.877, which will be
+  merged with our (few) changes and tagged 2.0.877-suse. See the
+  Changelog file for a details list of changes in this upstream
+  update. This update replaces:
+  * open-iscsi-2.0.876-suse.tar.bz2 (old)
+  with
+  *  open-iscsi-2.0.877-suse.tar.bz2 (new)
+  and resets the file:
+  * open-iscsi-SUSE-latest.diff.bz2
+  to be our local changes since version 2.0.877-suse. The spec
+  file is updated as well.
+
 -------------------------------------------------------------------
 Thu Sep 27 17:47:27 UTC 2018 - lduncan@suse.com
 

open-iscsi.spec

@@ -16,11 +16,11 @@
 #
 
 
-%define iscsi_release 876-suse
+%define iscsi_release 877-suse
 Name:           open-iscsi
-Version:        2.0.876
+Version:        2.0.877
 Release:        0
-Summary:        Linux Open-iSCSI Software Initiator
+Summary:        Linux iSCSI Software Initiator
 License:        GPL-2.0-or-later
 Group:          Productivity/Networking/Other
 Url:            http://www.open-iscsi.com
@@ -40,32 +40,35 @@ BuildRequires:  open-isns-devel
 BuildRequires:  openssl-devel
 BuildRequires:  suse-module-tools
 BuildRequires:  systemd
+BuildRequires:  systemd-devel
 Requires(post): coreutils
 Requires:       libopeniscsiusr0_2_0 = %{version}
 %{?systemd_requires}
 
 %description
-Open-iSCSI is a transport independent implementation of RFC 3720
+This is a transport independent implementation of RFC 3720
 iSCSI. It is partitioned into user and kernel parts.
 
 The kernel portion of Open-iSCSI implements the iSCSI data path (that
 is, iSCSI Read and iSCSI Write), and consists of two loadable
-modules: iscsi_if.ko and iscsi_tcp.ko.
+modules: iscsi_if.ko and iscsi_tcp.ko, and is now is delivered
+as part of the kernel.
 
-The user space part contains the entire control plane: configuration
+The user-space part contains the entire control plane: configuration
 manager, iSCSI Discovery, Login and Logout processing,
 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_0
-Version:        2.0.876
+Version:        2.0.877
 Release:        0
-Summary:        Userspace iSCSI API
+Summary:        iSCSI User-level Library
 Group:          System/Libraries
+Obsoletes:      libopeniscsiusr0_1_0
 
 %description -n libopeniscsiusr0_2_0
-The iSCSI userspace API from the open-iscsi project.
+The iSCSI user-space API from the open-iscsi project.
 
 %package -n iscsiuio
 Version:        0.7.8.4
@@ -78,7 +81,7 @@ Requires:       logrotate
 This tool is to be used in conjunction with the Broadcom NetXtreme II Linux
 driver (Kernel module name: "bnx2" and "bnx2x"), Broadcom CNIC driver,
 and the Broadcom iSCSI driver (Kernel module name: "bnx2i").
-This user space tool is used in conjunction with the following
+This user-space tool is used in conjunction with the following
 Broadcom Network Controllers:
 
 * bnx2:  BCM5706, BCM5708, BCM5709 devices
@@ -86,15 +89,15 @@ Broadcom Network Controllers:
          BCM57800, BCM57810, BCM57840 devices
 
 This utility will provide the ARP and DHCP functionality for the iSCSI offload.
-The communication to the driver is done via Userspace I/O (Kernel module name
+The communication to the driver is done via user-space I/O (Kernel module name
 "uio").
 
 %package devel
-Version:        2.0.876
+Version:        2.0.877
 Release:        0
-Summary:        Linux open-iscsi user-level library and include files
+Summary:        iSCSI User-level Library Development Library and Include files
 Group:          Development/Libraries/C and C++
-Requires:       %{name}
+Requires:       %{name} = %{version}
 
 %description devel
 This development package contains the open-iscsi user-level library
@@ -106,7 +109,8 @@ the libopeniscsiusr library.
 %patch1 -p1
 
 %build
-make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DUSE_KMOD -I/usr/include/kmod -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="-lkmod" user
+[ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH
+make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DUSE_KMOD -I/usr/include/kmod -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="-lkmod -lsystemd" user
 cd iscsiuio
 touch AUTHORS NEWS
 autoreconf --install
@@ -126,6 +130,8 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
 touch %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi
 install -m 0755 usr/iscsistart %{buildroot}/sbin
 %make_install -C iscsiuio
+# rename iscsiuio logrotate file to proper name
+mv %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuiolog %{buildroot}%{_sysconfdir}/logrotate.d/iscsiuio
 %fdupes %{buildroot}/%{_prefix}
 
 %post
@@ -193,13 +199,13 @@ fi
 %{_udevrulesdir}/50-iscsi-firmware-login.rules
 
 %files -n libopeniscsiusr0_2_0
-%{_libdir}/libopeniscsiusr.so*
+%{_libdir}/libopeniscsiusr.so.*
 
 %files -n iscsiuio
 /sbin/iscsiuio
 /sbin/brcm_iscsiuio
 %{_mandir}/man8/iscsiuio.8%{ext_man}
-%config %{_sysconfdir}/logrotate.d/iscsiuiolog
+%config %{_sysconfdir}/logrotate.d/iscsiuio
 %{_unitdir}/iscsiuio.service
 %{_unitdir}/iscsiuio.socket
 %{_sbindir}/rciscsiuio
@@ -207,5 +213,6 @@ fi
 %files devel
 %{_includedir}/libopeniscsiusr*.h
 %{_mandir}/man3/*.3%{ext_man}
+%{_libdir}/libopeniscsiusr.so
 
 %changelog