From 88f0c51d801a4fde5a9073c9b0b3e22edc23d06c Mon Sep 17 00:00:00 2001
From: "Michael A. Peters" <anymouseprophet@gmail.com>
Date: Fri, 2 Jun 2023 15:49:24 -0700
Subject: [PATCH] update yjl-sysusers

---
 SPECS/plocate.spec      |  2 +-
 SPECS/yjl-sysusers.spec | 29 +++++++++++++++++++++--------
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/SPECS/plocate.spec b/SPECS/plocate.spec
index f1572d1..196aa86 100644
--- a/SPECS/plocate.spec
+++ b/SPECS/plocate.spec
@@ -89,7 +89,7 @@ touch %{buildroot}%{_sharedstatedir}/plocate/plocate.db
 
 %pre
 %if 0%{?_yjl_sysusers:1} == 1
-%{_yjl_sysusers} --useradd False plocate
+%{_yjl_sysusers} --onlygroup plocate
 %else
 getent group plocate >/dev/null 2>&1 ||groupadd -r plocate
 %endif
diff --git a/SPECS/yjl-sysusers.spec b/SPECS/yjl-sysusers.spec
index cb1da93..6d9af60 100644
--- a/SPECS/yjl-sysusers.spec
+++ b/SPECS/yjl-sysusers.spec
@@ -1,15 +1,15 @@
-%global gitv 0.1.0
+%global gitv 0.1.5
 
 Name:     yjl-sysusers
 Version:  %{gitv}
-Release:	1%{?dist}
+Release:  1%{?dist}
 Summary:  utility for adding system groups and users
 BuildArch:  noarch
 
 Group:    System Administration/Utilities
 License:  MIT
 URL:      https://github.com/YellowJacketLinux/%{name}
-Source0:  https://github.com/YellowJacketLinux/%{name}/archive/refs/tags/v0.1.0.tar.gz
+Source0:  https://github.com/YellowJacketLinux/%{name}/archive/refs/tags/v%{gitv}.tar.gz
 
 BuildRequires:  python3-devel
 Requires:       python3
@@ -28,26 +28,39 @@ yjl-sysusers was developed with RPM package scriptlets in mind.
 
 %prep
 %setup -q
+# set shebang to full path
+sed -i 's?/usr/bin/env python3?%{python3}?' functions.py
 
 %build
 # If a distribution specific JSON exists in contrib, then
 # cat contrib/whatever.json > yjl-sysusers.json
 
 %install
-make install PYTHON=%{python3} RPMMACRODIR=%{_rpmmacrodir} DESTDIR=%{buildroot}
+PYTHON=%{python3} RPMMACRODIR=%{_rpmmacrodir} DESTDIR=%{buildroot} \
+make install-rpm
+# Adjust README.md for %%doc
+sed -i '/For installation instructions/d' README.md
+sed -i '/justsayno.jpg/d' README.md
+sed -i '5d' README.md
+sed -i 's?docs/yjl?yjl?g' README.md
 
 %files
 %defattr(-,root,root,-)
 %attr(0750,root,root) %{_sbindir}/yjl-sysusers
 %dir %{_datadir}/yjl-sysusers
-%attr(0444,root,root) %{_datadir}/yjl-sysusers/yjl-sysusers.json
+%attr(0644,root,root) %{_datadir}/yjl-sysusers/yjl-sysusers.json
 %attr(0644,root,root) %{_rpmmacrodir}/macros.yjl-sysusers
 %attr(0644,root,root) %{_mandir}/man5/yjl-sysusers.json.5*
 %attr(0644,root,root) %{_mandir}/man8/yjl-sysusers.8*
 %license LICENSE
-%doc CHARITYWARE.md LICENSE README.md TODO.md YJL-Notes.md yjl-sysusers.json
+%doc CHARITYWARE.md LICENSE README.md yjl-sysusers.json
+%doc docs/yjl-sysusers.json.5.md docs/yjl-sysusers.8.md
+%doc YJL-Notes.md
 
 %changelog
-* Sun May 28 2023 Michael A. Peters <anymouseprophet@gmail.com> - 0.1.0-1
-- Initial reference spec file
+* Fri Jun 02 2023 Michael A. Peters <anymouseprophet@gmail.com> - 0.1.5-1
+- Update to 0.1.5
+
+* Sun May 28 2023 Michael A. Peters <anymouseprophet@gmail.com> - 0.1.0-1
+- Reference spec file