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 b85c784..1aa9eeb 100644 --- a/open-iscsi.changes +++ b/open-iscsi.changes @@ -1,3 +1,26 @@ +------------------------------------------------------------------- +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 + +- 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}