Accepting request 568777 from home:lee_duncan:branches:network

- Removed the "rpm/" source directory from both the
  open-iscsi-2.0.876-suse.tar.bz2  and open-iscsi-SUSE-latest.diff.bz2
  files, since they are not needed for building and are not part
  of the upstream sources. They are still available under the
  git repository at github.com/hreinecke/open-iscsi.git. This means
  that changes to the spec file or the changes file will no longer
  require a change to the "*SUSE-latest*" file.

- Update to latest upstream vesion 2.0.876, with very few
  SUSE-specific modifications, namely around things upstream
  does not care about, like SUSE-specific systemd files. Also,
  version number modified to add "-suse", as usual. See
  the Changelog file for more details on changes in this
  upstream version.
  This replaces open-iscsi-2.0.875-suse.tar.bz2 with
  open-iscsi-2.0.876-suse.tar.bz2, and resets
  open-iscsi-SUSE-latest.diff.bz2 to contain only changes
  since the 2.0.876-suse tag.
  These changes added a new libopeniscsiusr.so library, as
  well as include files under a new open-iscsi-dev package,
  if you want to link against this library.
  The SPEC file was also cleaned up using spec-cleaner.

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

open-iscsi-2.0.875-suse.tar.bz2

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:6bf546552d66db587e1b1e7680adfa607395582f4d6ae869b1993a5bc3a7bbed
-size 503905

open-iscsi-2.0.876-suse.tar.bz2

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

open-iscsi-SUSE-latest.diff.bz2

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:65ba4ddd8ca3d68a592473677090bdbe123d82b6df896043b3780cb089238efb
+oid sha256:5a8c575c58438879f5a8b955914794b2351f34ce9d5627aeb88dbd4c3bc328ab
-size 6446
+size 1161

open-iscsi.changes

@@ -1,3 +1,35 @@
+-------------------------------------------------------------------
+Tue Jan 23 22:43:51 UTC 2018 - lduncan@suse.com
+
+- Removed the "rpm/" source directory from both the
+  open-iscsi-2.0.876-suse.tar.bz2  and open-iscsi-SUSE-latest.diff.bz2
+  files, since they are not needed for building and are not part
+  of the upstream sources. They are still available under the
+  git repository at github.com/hreinecke/open-iscsi.git. This means
+  that changes to the spec file or the changes file will no longer
+  require a change to the "*SUSE-latest*" file.
+
+-------------------------------------------------------------------
+Mon Jan 22 20:58:30 UTC 2018 - lduncan@suse.com
+
+- Update to latest upstream vesion 2.0.876, with very few
+  SUSE-specific modifications, namely around things upstream
+  does not care about, like SUSE-specific systemd files. Also,
+  version number modified to add "-suse", as usual. See
+  the Changelog file for more details on changes in this
+  upstream version.
+
+  This replaces open-iscsi-2.0.875-suse.tar.bz2 with
+  open-iscsi-2.0.876-suse.tar.bz2, and resets
+  open-iscsi-SUSE-latest.diff.bz2 to contain only changes
+  since the 2.0.876-suse tag.
+
+  These changes added a new libopeniscsiusr.so library, as
+  well as include files under a new open-iscsi-dev package,
+  if you want to link against this library.
+
+  The SPEC file was also cleaned up using spec-cleaner.
+
 -------------------------------------------------------------------
 Thu Dec 14 01:45:23 UTC 2017 - lduncan@suse.com
 

open-iscsi.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package open-iscsi
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -16,11 +16,21 @@
 #
 
 
+%define iscsi_release 876-suse
 Name:           open-iscsi
+Version:        2.0.876
+Release:        0
+Summary:        Linux* Open-iSCSI Software Initiator
+License:        GPL-2.0+
+Group:          Productivity/Networking/Other
+Url:            http://www.open-iscsi.com
+Source:         %{name}-2.0.%{iscsi_release}.tar.bz2
+Patch1:         %{name}-SUSE-latest.diff.bz2
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  bison
 BuildRequires:  db-devel < 5
+BuildRequires:  fdupes
 BuildRequires:  flex
 BuildRequires:  libmount-devel
 BuildRequires:  libtool
@@ -29,18 +39,8 @@ BuildRequires:  open-isns-devel
 BuildRequires:  openssl-devel
 BuildRequires:  suse-module-tools
 BuildRequires:  systemd
-Url:            http://www.open-iscsi.com
-Version:        2.0.875
-Release:        0
-%{?systemd_requires}
-%define iscsi_release 875-suse
-Summary:        Linux* Open-iSCSI Software Initiator
-License:        GPL-2.0+
-Group:          Productivity/Networking/Other
 Requires(post): coreutils
-Source:         %{name}-2.0.%{iscsi_release}.tar.bz2
+%{?systemd_requires}
-Patch1:         %{name}-SUSE-latest.diff.bz2
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
 %description
 Open-iSCSI is a high-performance, transport independent, multi-platform
@@ -62,10 +62,10 @@ The user space Open-iSCSI consists of a daemon process called iscsid,
 and a management utility iscsiadm.
 
 %package -n iscsiuio
-Summary:        Linux Broadcom NetXtremem II iscsi server
-Group:          Productivity/Networking/Other
 Version:        0.7.8.2
 Release:        0
+Summary:        Linux Broadcom NetXtremem II iscsi server
+Group:          Productivity/Networking/Other
 Requires:       logrotate
 
 %description -n iscsiuio
@@ -82,44 +82,59 @@ 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').
 
+%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}
+
+%description devel
+This development package contains the open-iscsi user-level library
+include files and documentation. These are used to compile against
+the libopeniscsiusr library.
+
 %prep
-%setup -n %{name}-2.0.%{iscsi_release}
+%setup -q -n %{name}-2.0.%{iscsi_release}
 %patch1 -p1
 
 %build
-%{__make} OPTFLAGS="${RPM_OPT_FLAGS} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"/etc/iscsi\\\"" LDFLAGS="" user
+make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="" user
 cd iscsiuio
 touch NEWS
 touch AUTHORS
 autoreconf --install
 %configure --sbindir=/sbin
-make CFLAGS="${RPM_OPT_FLAGS}"
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 %install
-make DESTDIR=${RPM_BUILD_ROOT} install_user
+make DESTDIR=%{buildroot} install_user
 # install service files
-make DESTDIR=${RPM_BUILD_ROOT} install_service_suse
+make DESTDIR=%{buildroot} install_service_suse
 # create rc symlinks
-[ -d ${RPM_BUILD_ROOT}/usr/sbin ] || mkdir -p ${RPM_BUILD_ROOT}/usr/sbin
+[ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir}
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsid
 ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsiuio
-(cd ${RPM_BUILD_ROOT}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
+(cd %{buildroot}/etc; ln -sf iscsi/iscsid.conf iscsid.conf)
-touch ${RPM_BUILD_ROOT}/etc/iscsi/initiatorname.iscsi
+touch %{buildroot}%{_sysconfdir}/iscsi/initiatorname.iscsi
 install -m 0755 usr/iscsistart %{buildroot}/sbin
-make DESTDIR=${RPM_BUILD_ROOT} -C iscsiuio install
+make DESTDIR=%{buildroot} -C iscsiuio install
+%fdupes %{buildroot}
 
 %post
 %{?regenerate_initrd_post}
-if [ ! -f /etc/iscsi/initiatorname.iscsi ] ; then
+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
@@ -141,13 +156,12 @@ fi
 %{service_del_preun iscsiuio.socket iscsiuio.service}
 
 %files
-%defattr(-,root,root)
+%dir %{_sysconfdir}/iscsi
-%dir /etc/iscsi
+%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/iscsi/iscsid.conf
-%attr(0600,root,root) %config(noreplace) /etc/iscsi/iscsid.conf
+%ghost %{_sysconfdir}/iscsi/initiatorname.iscsi
-%ghost /etc/iscsi/initiatorname.iscsi
+%dir %{_sysconfdir}/iscsi/ifaces
-%dir /etc/iscsi/ifaces
+%config %{_sysconfdir}/iscsi/ifaces/iface.example
-%config /etc/iscsi/ifaces/iface.example
+%{_sysconfdir}/iscsid.conf
-/etc/iscsid.conf
 %{_unitdir}/iscsid.service
 %{_unitdir}/iscsid.socket
 %{_unitdir}/iscsi.service
@@ -163,24 +177,26 @@ fi
 /sbin/iscsi_discovery
 /sbin/iscsi_fw_login
 %doc COPYING README
-%doc %{_mandir}/man8/iscsiadm.8.gz
+%{_mandir}/man8/iscsiadm.8%{ext_man}
-%doc %{_mandir}/man8/iscsid.8.gz
+%{_mandir}/man8/iscsid.8%{ext_man}
-%doc %{_mandir}/man8/iscsi_discovery.8.gz
+%{_mandir}/man8/iscsi_discovery.8%{ext_man}
-%doc %{_mandir}/man8/iscsistart.8.gz
+%{_mandir}/man8/iscsistart.8%{ext_man}
-%doc %{_mandir}/man8/iscsi-iname.8.gz
+%{_mandir}/man8/iscsi-iname.8%{ext_man}
-%doc %{_mandir}/man8/iscsi_fw_login.8.gz
+%{_mandir}/man8/iscsi_fw_login.8%{ext_man}
-%dir %{_sysconfdir}/udev
+%{_udevrulesdir}/50-iscsi-firmware-login.rules
-%dir %{_sysconfdir}/udev/rules.d
+%{_libdir}/libopeniscsiusr.so*
-%config %{_sysconfdir}/udev/rules.d/50-iscsi-firmware-login.rules
 
 %files -n iscsiuio
-%defattr(-,root,root)
 /sbin/iscsiuio
 /sbin/brcm_iscsiuio
-%doc %{_mandir}/man8/iscsiuio.8.gz
+%{_mandir}/man8/iscsiuio.8%{ext_man}
-%config /etc/logrotate.d/iscsiuiolog
+%config %{_sysconfdir}/logrotate.d/iscsiuiolog
 %{_unitdir}/iscsiuio.service
 %{_unitdir}/iscsiuio.socket
 %{_sbindir}/rciscsiuio
 
+%files devel
+%{_includedir}/libopeniscsiusr*.h
+%{_mandir}/man3/*.3%{ext_man}
+
 %changelog