From 0892717ee2fc4cd8b22181ae9ff3e8ea966f6165 Mon Sep 17 00:00:00 2001
From: Dan Callaghan <dan.callaghan@opengear.com>
Date: Jan 30 2020 04:08:10 +0000
Subject: adjustments based on package review feedback


---

diff --git a/bmap-tools.spec b/bmap-tools.spec
index 65e557c..7fb1d75 100644
--- a/bmap-tools.spec
+++ b/bmap-tools.spec
@@ -2,14 +2,17 @@
 
 Name:           bmap-tools
 Version:        3.5
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Tools to generate and flash sparse images using the "block map" (bmap) format
 License:        GPLv2+
 URL:            https://github.com/intel/bmap-tools
 Source0:        https://github.com/intel/bmap-tools/archive/v%{version}/%{name}-%{version}.tar.gz
 # https://github.com/intel/bmap-tools/commit/db7087b883bf52cbff063ad17a41cc1cbb85104
+# Fixes https://github.com/intel/bmap-tools/issues/57 for Python 3.7+
 Patch1:         db7087b883bf52cbff063ad17a41cc1cbb85104d.patch
 BuildArch:      noarch
+# Base package contains the command line tool, which uses the Python library
+Requires:       python3-%{module_name} = %{version}-%{release}
 
 %description
 Tools to generate "block map" (a.k.a. bmap) files and flash images. Bmaptool is
@@ -40,16 +43,11 @@ Requires:       pigz
 %description -n python3-%{module_name}
 Python library for bmap-tools.
 
-%package -n bmaptool
-Summary:        Tool to manipulate sparse images in the "block map" (bmap) format
-Requires:       python3-%{module_name} = %{version}-%{release}
-
-%description -n bmaptool
-Command-line utility for bmap-tools.
-
 %prep
 %setup -q
 %patch1 -p1
+# Remove unnecessary shebang
+sed -i -e '/^#!/,1d' bmaptools/CLI.py
 
 %build
 %py3_build
@@ -62,16 +60,20 @@ install -m644 docs/man1/bmaptool.1 %{buildroot}/%{_mandir}/man1
 %check
 nosetests-3
 
+%files
+%{_bindir}/bmaptool
+%{_mandir}/man1/bmaptool.1*
+
 %files -n python3-%{module_name}
 %doc docs/README docs/RELEASE_NOTES
 %license COPYING
 %{python3_sitelib}/%{module_name}
 %{python3_sitelib}/bmap_tools*.egg-info
 
-%files -n bmaptool
-%{_bindir}/bmaptool
-%{_mandir}/man1/bmaptool.1*
-
 %changelog
+* Mon Dec 30 2019 Dan Callaghan <dan.callaghan@opengear.com> - 3.5-2
+- dropped the separate 'bmaptool' subpackage, the base package now provides
+  /usr/bin/bmaptool
+
 * Tue Jan 29 2019 Dan Callaghan <dan.callaghan@opengear.com> - 3.5-1
 - initial version