Accepting request 578544 from home:lee_duncan:branches:network

- Fix ARP booting issue with different subnets
  (bsc#1058463), updating:
  * open-iscsi-SUSE-latest.diff.bz2

- Trim filler wording from description.
  Update old commands/RPM variables to macros.
- Implement shared library packaging guideline.
- Do not let fdupes run across partitions.

OBS-URL: https://build.opensuse.org/request/show/578544
OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=97

open-iscsi-SUSE-latest.diff.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:5a8c575c58438879f5a8b955914794b2351f34ce9d5627aeb88dbd4c3bc328ab
+oid sha256:125c1a46e2cb46115fe6799cc3f8ecd4493713f317e2433a4bc3da5a0410c03c
-size 1161
+size 1440

open-iscsi.changes

@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Tue Feb 20 19:40:58 UTC 2018 - lduncan@suse.com
+
+- Fix ARP booting issue with different subnets
+  (bsc#1058463), updating:
+  * open-iscsi-SUSE-latest.diff.bz2
+
+-------------------------------------------------------------------
+Wed Feb  7 17:50:15 UTC 2018 - jengelh@inai.de
+
+- Trim filler wording from description.
+  Update old commands/RPM variables to macros.
+- Implement shared library packaging guideline.
+- Do not let fdupes run across partitions.
+
 -------------------------------------------------------------------
 Tue Jan 23 22:43:51 UTC 2018 - lduncan@suse.com
 

open-iscsi.spec

@@ -20,7 +20,7 @@
 Name:           open-iscsi
 Version:        2.0.876
 Release:        0
-Summary:        Linux* Open-iSCSI Software Initiator
+Summary:        Linux Open-iSCSI Software Initiator
 License:        GPL-2.0+
 Group:          Productivity/Networking/Other
 Url:            http://www.open-iscsi.com
@@ -43,23 +43,27 @@ Requires(post): coreutils
 %{?systemd_requires}
 
 %description
-Open-iSCSI is a high-performance, transport independent, multi-platform
+Open-iSCSI is a transport independent implementation of RFC 3720
-implementation of RFC3720 iSCSI.
+iSCSI. It is partitioned into user and kernel parts.
 
-Open-iSCSI 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.
 
-The kernel portion of Open-iSCSI is a from-scratch code licensed under
+The user space part contains the entire control plane: configuration
-GPL. The kernel part implements iSCSI data path (that is, iSCSI Read
+manager, iSCSI Discovery, Login and Logout processing,
-and iSCSI Write), and consists of two loadable modules: iscsi_if.ko and
+connection-level error processing, Nop-In and Nop-Out handling. It
-iscsi_tcp.ko.
+comes with a daemon process called iscsid, and a management utility,
+iscsiadm.
 
-User space contains the entire control plane: configuration manager,
+%package -n libopeniscsiusr0_1_0
-iSCSI Discovery, Login and Logout processing, connection-level error
+Version:        2.0.876
-processing, Nop-In and Nop-Out handling, and (in the future:) Text
+Release:        0
-processing, iSNS, SLP, Radius, etc.
+Summary:        iSCSI userspace API
+Group:          System/Libraries
 
-The user space Open-iSCSI consists of a daemon process called iscsid,
+%description -n libopeniscsiusr0_1_0
-and a management utility iscsiadm.
+The iSCSI userspace API from the open-iscsi project.
 
 %package -n iscsiuio
 Version:        0.7.8.2
@@ -70,24 +74,25 @@ Requires:       logrotate
 
 %description -n iscsiuio
 This tool is to be used in conjunction with the Broadcom NetXtreme II Linux
-driver (Kernel module name: 'bnx2' and 'bnx2x'), Broadcom CNIC driver,
+driver (Kernel module name: "bnx2" and "bnx2x"), Broadcom CNIC driver,
-and the Broadcom iSCSI driver (Kernel module name: 'bnx2i').
+and the Broadcom iSCSI driver (Kernel module name: "bnx2i").
 This user space tool is used in conjunction with the following
 Broadcom Network Controllers:
-  bnx2:  BCM5706, BCM5708, BCM5709 devices
+
-  bnx2x: BCM57710, BCM57711, BCM57711E, BCM57712, BCM57712E,
+* bnx2:  BCM5706, BCM5708, BCM5709 devices
+* bnx2x: BCM57710, BCM57711, BCM57711E, BCM57712, BCM57712E,
          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
-'uio').
+"uio").
 
 %package devel
 Version:        2.0.876
 Release:        0
 Summary:        Linux open-iscsi user-level library and include files
 Group:          Development/Libraries/C and C++
-Requires:       %{name}
+Requires:       libopeniscsiusr0 = %{version}
 
 %description devel
 This development package contains the open-iscsi user-level library
@@ -101,8 +106,7 @@ the libopeniscsiusr library.
 %build
 make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="" user
 cd iscsiuio
-touch NEWS
+touch AUTHORS NEWS
-touch AUTHORS
 autoreconf --install
 %configure --sbindir=/sbin
 make %{?_smp_mflags} CFLAGS="%{optflags}"
@@ -119,22 +123,20 @@ ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
 (cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
 touch %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi
 install -m 0755 usr/iscsistart %{buildroot}/sbin
-make DESTDIR=%{buildroot} -C iscsiuio install
+%make_install -C iscsiuio
-%fdupes %{buildroot}
+%fdupes %{buildroot}/%{_prefix}
 
 %post
 %{?regenerate_initrd_post}
 if [ ! -f %{_sysconfdir}/iscsi/initiatorname.iscsi ] ; then
     /sbin/iscsi-gen-initiatorname
 fi
-%{run_ldconfig}
 %{service_add_post iscsid.socket iscsid.service iscsi.service}
 
 %posttrans
 %{?regenerate_initrd_posttrans}
 
 %postun
-%{run_ldconfig}
 %{service_del_postun iscsid.socket iscsid.service iscsi.service}
 
 %pre
@@ -143,6 +145,9 @@ fi
 %preun
 %{service_del_preun iscsid.socket iscsid.service iscsi.service}
 
+%post   -n libopeniscsiusr0_1_0 -p /sbin/ldconfig
+%postun -n libopeniscsiusr0_1_0 -p /sbin/ldconfig
+
 %post -n iscsiuio
 %{service_add_post iscsiuio.socket iscsiuio.service}
 
@@ -184,6 +189,8 @@ fi
 %{_mandir}/man8/iscsi-iname.8%{ext_man}
 %{_mandir}/man8/iscsi_fw_login.8%{ext_man}
 %{_udevrulesdir}/50-iscsi-firmware-login.rules
+
+%files -n libopeniscsiusr0_1_0
 %{_libdir}/libopeniscsiusr.so*
 
 %files -n iscsiuio