From 926e7e26ad41210a521dadff2997f9da6c181a389e4ea340e96645232ab2fddd Mon Sep 17 00:00:00 2001
From: Lee Duncan <lduncan@suse.com>
Date: Tue, 4 Sep 2018 17:58:22 +0000
Subject: [PATCH] Accepting request 633202 from
 home:lee_duncan:branches:network

- Use libkmod instead of running modprobe (bsc#1106685), updating
  the spec file, and:
  * open-iscsi-SUSE-latest.diff.bz2

OBS-URL: https://build.opensuse.org/request/show/633202
OBS-URL: https://build.opensuse.org/package/show/network/open-iscsi?expand=0&rev=110
---
 open-iscsi-SUSE-latest.diff.bz2 | 4 ++--
 open-iscsi.changes              | 7 +++++++
 open-iscsi.spec                 | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/open-iscsi-SUSE-latest.diff.bz2 b/open-iscsi-SUSE-latest.diff.bz2
index f214aea..ae1d0a2 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:710c6968fe38860faaa13f3502e34ed8d8bf826c34bd1486341ea48fbdfb33fc
-size 4135
+oid sha256:ba7993d30a79ff0b2527a51bbe712c44223ebb8c120ce713e4c01a2d32ac0b35
+size 4391
diff --git a/open-iscsi.changes b/open-iscsi.changes
index f8799ad..bd02c36 100644
--- a/open-iscsi.changes
+++ b/open-iscsi.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep  4 17:35:55 UTC 2018 - lduncan@suse.com
+
+- Use libkmod instead of running modprobe (bsc#1106685), updating
+  the spec file, and:
+  * open-iscsi-SUSE-latest.diff.bz2
+
 -------------------------------------------------------------------
 Fri Aug 31 16:15:47 UTC 2018 - lduncan@suse.com
 
diff --git a/open-iscsi.spec b/open-iscsi.spec
index ee9d681..f532e4a 100644
--- a/open-iscsi.spec
+++ b/open-iscsi.spec
@@ -32,6 +32,7 @@ BuildRequires:  bison
 BuildRequires:  db-devel < 5
 BuildRequires:  fdupes
 BuildRequires:  flex
+BuildRequires:  libkmod-devel
 BuildRequires:  libmount-devel
 BuildRequires:  libtool
 BuildRequires:  make
@@ -105,7 +106,7 @@ the libopeniscsiusr library.
 %patch1 -p1
 
 %build
-make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="" user
+make %{?_smp_mflags} OPTFLAGS="%{optflags} -fno-strict-aliasing -DOFFLOAD_BOOT_SUPPORTED -DUSE_KMOD -I/usr/include/kmod -DLOCK_DIR=\\\"%{_sysconfdir}/iscsi\\\"" LDFLAGS="-lkmod" user
 cd iscsiuio
 touch AUTHORS NEWS
 autoreconf --install