From e6d6f07fa7cae75b3de13166ba13e642fde4a7b9 Mon Sep 17 00:00:00 2001
From: eabdullin <ed.abdullin.1@gmail.com>
Date: Thu, 28 Mar 2024 11:55:58 +0000
Subject: [PATCH] import CS tlog-14-1.el9

---
 .gitignore            |  2 +-
 .tlog.metadata        |  2 +-
 SOURCES/tlog.sysusers |  2 ++
 SPECS/tlog.spec       | 22 +++++++++++++++-------
 4 files changed, 19 insertions(+), 9 deletions(-)
 create mode 100644 SOURCES/tlog.sysusers

diff --git a/.gitignore b/.gitignore
index f16550c..c9ec122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/tlog-13.tar.gz
+SOURCES/tlog-14.tar.gz
diff --git a/.tlog.metadata b/.tlog.metadata
index 2b46fae..d9bcd45 100644
--- a/.tlog.metadata
+++ b/.tlog.metadata
@@ -1 +1 @@
-47fa5adda56037b2a7e87be84af7a4ee6f8bb418 SOURCES/tlog-13.tar.gz
+0c6f3cc5622164a60e5295176e7af8612eb09606 SOURCES/tlog-14.tar.gz
diff --git a/SOURCES/tlog.sysusers b/SOURCES/tlog.sysusers
new file mode 100644
index 0000000..d805593
--- /dev/null
+++ b/SOURCES/tlog.sysusers
@@ -0,0 +1,2 @@
+u   tlog	-	"Tlog terminal I/O logger"	/run/tlog	/sbin/nologin
+g   tlog 	-
diff --git a/SPECS/tlog.spec b/SPECS/tlog.spec
index f03aeb8..06382d3 100644
--- a/SPECS/tlog.spec
+++ b/SPECS/tlog.spec
@@ -19,7 +19,7 @@
 %{!?make_build:%global make_build %{__make} %{?_smp_mflags}}
 
 Name:           tlog
-Version:        13
+Version:        14
 Release:        1%{?dist}
 Summary:        Terminal I/O logger
 
@@ -34,7 +34,8 @@ License:        GPLv2+
 %endif
 
 URL:            https://github.com/Scribery/%{name}
-Source:         %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source0:        %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz
+Source1:        tlog.sysusers
 
 BuildRequires:  autoconf
 BuildRequires:  automake
@@ -57,6 +58,7 @@ Requires:         systemd-sysv
 Requires(preun):  systemd
 Requires(post):   systemd
 Requires(postun): systemd
+%{?sysusers_requires_compat}
 %endif
 
 %else
@@ -111,6 +113,7 @@ rm -r %{buildroot}/usr/include/%{name}
     mkdir -p %{buildroot}%{_localstatedir}/run
     install -d -m 0755 %{buildroot}%{_localstatedir}/run/%{name}
 %endif
+install -p -D -m 0644 %{SOURCE1} %{buildroot}%{_sysusersdir}/%{name}.conf
 
 %files
 %{!?_licensedir:%global license %doc}
@@ -133,13 +136,10 @@ rm -r %{buildroot}/usr/include/%{name}
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}-rec.conf
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}-rec-session.conf
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}-play.conf
+%{_sysusersdir}/%{name}.conf
 
 %pre
-getent group %{name} >/dev/null ||
-    groupadd -r %{name}
-getent passwd %{name} >/dev/null ||
-    useradd -r -g %{name} -d %{_localstatedir}/run/%{name} -s /sbin/nologin \
-            -c "Tlog terminal I/O logger" %{name}
+%sysusers_create_compat %{SOURCE1}
 
 %post
 /sbin/ldconfig
@@ -156,6 +156,14 @@ systemd-tmpfiles --create %{name}.conf >/dev/null 2>&1 || :
 /sbin/ldconfig
 
 %changelog
+* Wed Feb 07 2024 Justin Stephenson <jstephen@redhat.com> - 14-1
+- Release v14
+- configure: correctly handle systemd versions before 245
+
+* Fri Jul 14 2023 Justin Stephenson <jstephen@redhat.com> - 13-2
+- Provide a sysusers.d file to get user() and group() provides
+  (see https://fedoraproject.org/wiki/Changes/Adopting_sysusers.d_format).
+
 * Mon Apr 17 2023 Justin Stephenson <jstephen@redhat.com> - 13-1
 - Update the Fedora license
 - MAN: Add missing comma in tlog-rec-session.conf