From e22e374e2f7f6e98cc0f5b6eebebd6e2770676a7 Mon Sep 17 00:00:00 2001
From: Neal Gompa <ngompa@datto.com>
Date: Tue, 12 Apr 2022 16:54:08 -0400
Subject: [PATCH] Update spec to comply with packaging guidelines

- Use correct globbing for libraries in file list
- Rename Python binding subpackage to match Python guidelines
- Stop globbing binaries in util subpackage
---
 libkdumpfile.spec | 37 ++++++++++++++++++++++++++-----------
 1 file changed, 26 insertions(+), 11 deletions(-)

diff --git a/libkdumpfile.spec b/libkdumpfile.spec
index dc7ea2d..cb5fb2c 100644
--- a/libkdumpfile.spec
+++ b/libkdumpfile.spec
@@ -1,6 +1,9 @@
+%global mainlibsover 8
+%global addrlibsover 1
+
 Name:           libkdumpfile
 Version:        0.4.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Kernel coredump file access
 
 License:        LGPLv3+ or GPLv2+
@@ -33,12 +36,15 @@ Summary:        Documentation for %{name}
 %description    doc
 The %{name}-doc package contains documentation for %{name}.
 
-%package        python
+%package -n python3-%{name}
 Summary:        Python bindings for %{name}
+Obsoletes:      %{name}-python < %{version}-%{release}
+Provides:       %{name}-python = %{version}-%{release}
+Provides:       %{name}-python%{?_isa} = %{version}-%{release}
 Requires:       %{name}%{?_isa} = %{version}-%{release}
 
-%description    python
-The %{name}-python package contains Python bindings for %{name}.
+%description -n python3-%{name}
+The python3-%{name} package contains Python bindings for %{name}.
 
 %package        util
 Summary:        Utilities to read kernel core dumps
@@ -64,13 +70,14 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 
 %files
 %license COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
-%doc README.md NEWS 
-%{_libdir}/libaddrxlat.so.1*
-%{_libdir}/libkdumpfile.so.8*
+%doc README.md NEWS
+%{_libdir}/libaddrxlat.so.%{mainlibsover}{,.*}
+%{_libdir}/libkdumpfile.so.%{addrlibsover}{,.*}
 
 %files devel
-%{_includedir}/*
-%{_libdir}/*.so
+%{_includedir}/%{name}/
+%{_libdir}/libaddrxlat.so
+%{_libdir}/libkdumpfile.so
 %{_libdir}/pkgconfig/libaddrxlat.pc
 %{_libdir}/pkgconfig/libkdumpfile.pc
 
@@ -78,16 +85,24 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
 %license COPYING COPYING.GPLv2 COPYING.GPLv3 COPYING.LGPLv3
 %doc doc/html
 
-%files python
+%files -n python3-%{name}
 %{python3_sitelib}/addrxlat
 %{python3_sitearch}/_addrxlat.so*
 %{python3_sitelib}/kdumpfile
 %{python3_sitearch}/_kdumpfile.so*
 
 %files util
-%{_bindir}/*
+%{_bindir}/dumpattr
+%{_bindir}/listxendoms
+%{_bindir}/showxlat
 
 %changelog
+* Tue Apr 12 2022 Neal Gompa <ngompa@datto.com> - 0.4.0-6
+- Update spec to comply with packaging guidelines
+  + Use correct globbing for libraries in file list
+  + Rename Python binding subpackage to match Python guidelines
+  + Stop globbing binaries in util subpackage
+
 * Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.4.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild