From 9f9048a6db543bc42b92ba64e019a267fdea1f43 Mon Sep 17 00:00:00 2001
From: Chris Leech <cleech@redhat.com>
Date: Nov 05 2020 22:55:34 +0000
Subject: add libopeniscsiusr content to iscsi-initiator-utils-devel


---

diff --git a/iscsi-initiator-utils.spec b/iscsi-initiator-utils.spec
index 3055496..737c793 100644
--- a/iscsi-initiator-utils.spec
+++ b/iscsi-initiator-utils.spec
@@ -9,7 +9,7 @@
 Summary: iSCSI daemon and utility programs
 Name: iscsi-initiator-utils
 Version: 6.%{open_iscsi_version}.%{open_iscsi_build}
-Release: 2.git%{shortcommit0}%{?dist}
+Release: 3.git%{shortcommit0}%{?dist}
 License: GPLv2+
 URL: http://www.open-iscsi.org
 Source0: https://github.com/open-iscsi/open-iscsi/archive/%{commit0}.tar.gz#/open-iscsi-%{shortcommit0}.tar.gz
@@ -61,27 +61,6 @@ as well as the utility programs used to manage it. iSCSI is a protocol
 for distributed disk access using SCSI commands sent over Internet
 Protocol networks.
 
-# I don't think we're ready to expose these just yet
-# For now just add the needed library to the base package
-
-#%%package -n libopeniscsiusr
-#Summary: library providing access to Open-iSCSI initiator functionality
-#Group: Development/Libraries
-#License: BSD
-
-#%%description -n libopeniscsiusr
-#The libopeniscsiusr library provides a C API for access to the Open-iSCSI
-#initiator. It is used by the Open-iSCSI command line tools.
-
-#%%package -n libopeniscsiusr-devel
-#Summary: Development files for libopeniscsiusr
-#Group: Development/Libraries
-#Requires: libopeniscsiusr = %%{version}-%%{release}
-
-#%%description -n libopeniscsiusr-devel
-#The libopeniscsiusr-devel package contains libraries and header files for
-#developing applications that use libopeniscsiusr.
-
 %package iscsiuio
 Summary: Userspace configuration daemon required for some iSCSI hardware
 License: BSD
@@ -290,26 +269,7 @@ fi
 %{_mandir}/man8/iscsiadm.8.gz
 %{_mandir}/man8/iscsid.8.gz
 %{_mandir}/man8/iscsistart.8.gz
-# until we decide to setup libopeniscsiusr as a subpkg for real
 %{_libdir}/libopeniscsiusr.so.*
-%exclude %{_libdir}/libopeniscsiusr.so
-%exclude %{_includedir}/libopeniscsiusr.h
-%exclude %{_includedir}/libopeniscsiusr_common.h
-%exclude %{_includedir}/libopeniscsiusr_iface.h
-%exclude %{_includedir}/libopeniscsiusr_node.h
-%exclude %{_includedir}/libopeniscsiusr_session.h
-%exclude %{_libdir}/pkgconfig/libopeniscsiusr.pc
-
-# %%files -n libopeniscsiusr
-# %%{_libdir}/libopeniscsiusr.so.*
-#
-# %%files -n libopeniscsiusr-devel
-# %%{_libdir}/libopeniscsiusr.so
-# %%{_includedir}/libopeniscsiusr.h
-# %%{_includedir}/libopeniscsiusr_common.h
-# %%{_includedir}/libopeniscsiusr_iface.h
-# %%{_includedir}/libopeniscsiusr_session.h
-# %%{_libdir}/pkgconfig/libopeniscsiusr.pc
 
 %files iscsiuio
 %{_sbindir}/iscsiuio
@@ -322,6 +282,13 @@ fi
 %doc libiscsi/html
 %{_libdir}/libiscsi.so
 %{_includedir}/libiscsi.h
+%{_libdir}/libopeniscsiusr.so
+%{_includedir}/libopeniscsiusr.h
+%{_includedir}/libopeniscsiusr_common.h
+%{_includedir}/libopeniscsiusr_iface.h
+%{_includedir}/libopeniscsiusr_node.h
+%{_includedir}/libopeniscsiusr_session.h
+%{_libdir}/pkgconfig/libopeniscsiusr.pc
 
 %if %{with python2}
 %files -n python2-%{name}
@@ -333,6 +300,9 @@ fi
 %{python3_sitearch}/*
 
 %changelog
+* Thu Nov 05 2020 Chris Leech <cleech@redhat.com> - 6.2.1.2-3.gita8fcb37
+- add libopeniscsiusr content to iscsi-initiator-utils-devel
+
 * Mon Sep 21 2020 Chris Leech <cleech@redhat.com> - 6.2.1.2-1.git13e7f58
 - iscsiadm overflow regression when discovering many targets at once
 - check for invalid session id during stop connection