From d6325189bc28b7e19d4582c7ee614d1197b1657ee0428a2e37724aa79121eb36 Mon Sep 17 00:00:00 2001
From: "Dr. Werner Fink" <werner@suse.com>
Date: Mon, 31 May 2021 12:43:44 +0000
Subject: [PATCH] Change to using systemd-sysusers

OBS-URL: https://build.opensuse.org/package/show/Publishing:TeXLive/texlive?expand=0&rev=393
---
 texlive.changes |  5 +++++
 texlive.spec    | 14 ++++----------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/texlive.changes b/texlive.changes
index 3e252c7..b16ab6c 100644
--- a/texlive.changes
+++ b/texlive.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun May 30 16:43:21 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Change to using systemd-sysusers
+
 -------------------------------------------------------------------
 Wed May  5 06:15:46 UTC 2021 - Dr. Werner Fink <werner@suse.de>
 
diff --git a/texlive.spec b/texlive.spec
index 9c9dd35..2a2d9cd 100644
--- a/texlive.spec
+++ b/texlive.spec
@@ -84,6 +84,8 @@ PreReq:         sed
 #!BuildIgnore:  %{name}-kpathsea
 #!BuildIgnore:  %{name}-scripts-bin
 #!BuildIgnore:  %{name}-scripts
+Requires(pre):  user(mktex)
+Requires(pre):  group(mktex)
 Requires(post): coreutils
 Requires(postun):coreutils
 Requires(posttrans):coreutils
@@ -1500,8 +1502,8 @@ Summary:        Binary files of kpathsea
 Group:          Productivity/Publishing/TeX/Utilities
 URL:            http://www.tug.org/texlive/
 Requires(pre):  %{name}-filesystem >= %{texlive_version}
-Requires(pre):  /usr/bin/getent
-Requires(pre):  /usr/sbin/groupadd
+Requires(pre):  user(mktex)
+Requires(pre):  group(mktex)
 Requires(post): %{name}-filesystem
 Requires(post): permissions
 Requires:       %{name}-gsftopk-bin
@@ -4468,19 +4470,11 @@ rm -vf %{buildroot}%{_bindir}/ebong
 %verify_permissions -e %{_libexecdir}/mktex/public
 %endif
 
-%pre kpathsea-bin
-%{_bindir}/getent group  %{texgrp} > /dev/null 2>&1 || %{_sbindir}/groupadd -r %{?texgid:-g %texgid} %{texgrp}
-%{_bindir}/getent passwd %{texusr} > /dev/null 2>&1 || %{_sbindir}/useradd  -r %{?texuid:-u %texuid} -g %{texgrp} -d %{_fontcache} -s /bin/false %{texusr}
-
 %post kpathsea-bin
 %if %{defined set_permissions}
 %set_permissions %{_libexecdir}/mktex/public
 %endif
 
-%pre
-%{_bindir}/getent group  %{texgrp} > /dev/null 2>&1 || %{_sbindir}/groupadd -r %{?texgid:-g %texgid} %{texgrp}
-%{_bindir}/getent passwd %{texusr} > /dev/null 2>&1 || %{_sbindir}/useradd  -r %{?texuid:-u %texuid} -g %{texgrp} -d %{_fontcache} -s /bin/false %{texusr}
-
 %post
 mkdir -p /var/run/texlive
 > /var/run/texlive/run-mktexlsr