From 7a0dff6a0dd9e7efc30c767160cbdfd25d4dbab8f01de69f76217e149c585584 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Mon, 14 Jan 2019 21:26:32 +0000 Subject: [PATCH 1/2] Accepting request 666060 from home:lee_duncan:branches:network - Update SPEC file to allow %_libdir macro to override LIB_DIR when building or installing - Update SPEC file to use %license macro for COPYING file so that it gets delivered when when other docs are excluded (bsc#1121877) OBS-URL: https://build.opensuse.org/request/show/666060 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=124 --- open-iscsi.changes | 13 +++++++++++++ open-iscsi.spec | 13 +++++++------ 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/open-iscsi.changes b/open-iscsi.changes index b85c784..e608375 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,16 @@ +------------------------------------------------------------------- +Mon Jan 14 21:18:35 UTC 2019 - lduncan@suse.com + +- Update SPEC file to allow %_libdir macro to override LIB_DIR + when building or installing + +------------------------------------------------------------------- +Mon Jan 14 20:42:26 UTC 2019 - lduncan@suse.com + +- Update SPEC file to use %license macro for COPYING + file so that it gets delivered when when other docs + are excluded (bsc#1121877) + ------------------------------------------------------------------- Thu Dec 6 18:38:33 UTC 2018 - lduncan@suse.com diff --git a/open-iscsi.spec b/open-iscsi.spec index 19acb5d..8455427 100644 --- a/open-iscsi.spec +++ b/open-iscsi.spec @@ -1,7 +1,7 @@ # # spec file for package open-iscsi # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 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 @@ -111,17 +111,17 @@ the libopeniscsiusr library. %build [ -z "$SOURCE_DATE_EPOCH" ] || export KBUILD_BUILD_TIMESTAMP=@$SOURCE_DATE_EPOCH -make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" user +make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LIB_DIR=%{_libdir} user cd iscsiuio touch AUTHORS NEWS autoreconf --install %configure --sbindir=/sbin -make %{?_smp_mflags} CFLAGS="%{optflags}" +make %{?_smp_mflags} CFLAGS="%{optflags}" LIB_DIR=%{_libdir} %install -make DESTDIR=%{buildroot} install_user +make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} install_user # install service files -make DESTDIR=%{buildroot} install_service_suse +make DESTDIR=%{buildroot} LIB_DIR=%{_libdir} install_service_suse # create rc symlinks [ -d %{buildroot}%{_sbindir} ] || mkdir -p %{buildroot}%{_sbindir} ln -s %{_sbindir}/service %{buildroot}%{_sbindir}/rciscsi @@ -190,7 +190,8 @@ fi /sbin/iscsi_offload /sbin/iscsi_discovery /sbin/iscsi_fw_login -%doc COPYING README +%doc README +%license COPYING %{_mandir}/man8/iscsiadm.8%{ext_man} %{_mandir}/man8/iscsid.8%{ext_man} %{_mandir}/man8/iscsi_discovery.8%{ext_man} From 52c966f9c38408d1014f659283469a60ac216b989938a7c8756bc426c9835ec6 Mon Sep 17 00:00:00 2001 From: Lee Duncan Date: Wed, 23 Jan 2019 21:31:28 +0000 Subject: [PATCH 2/2] Accepting request 668186 from home:lee_duncan:branches:network - Merged latest upstream commits to get needed fix: * Fix output for iscsiadm node/iface print level P1 (needed for bsc#1122938) * Updated iscsiadm man page: add "onboot" handling. Updating: * open-iscsi-SUSE-latest.diff.bz2 OBS-URL: https://build.opensuse.org/request/show/668186 OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=125 --- open-iscsi-SUSE-latest.diff.bz2 | 4 ++-- open-iscsi.changes | 10 ++++++++++ 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2 index c3b3d72..3f0390c 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:a8e5d385ac944a177c2ad681dc84f7440d2365de87b49b54eedfdcda872362f7 -size 3827 +oid sha256:56f95f5afe59ddc514d4ed508ae716bc3eaeaac9b613e28225cc2d42c2981f40 +size 10193 diff --git a/open-iscsi.changes b/open-iscsi.changes index e608375..1aa9eeb 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Wed Jan 23 20:31:56 UTC 2019 - lduncan@suse.com + +- Merged latest upstream commits to get needed fix: + * Fix output for iscsiadm node/iface print level P1 (needed + for bsc#1122938) + * Updated iscsiadm man page: add "onboot" handling. + Updating: + * open-iscsi-SUSE-latest.diff.bz2 + ------------------------------------------------------------------- Mon Jan 14 21:18:35 UTC 2019 - lduncan@suse.com