From fe2d027119a38c85638389bec4da0449c98c7d31 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 18 May 2023 09:31:58 -0700
Subject: [PATCH] Have util-linux obsolete and provide util-linux-user

---
 util-linux.spec | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/util-linux.spec b/util-linux.spec
index cdd23c2..d664c02 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -2,7 +2,7 @@
 Summary: Collection of basic system utilities
 Name: util-linux
 Version: 2.39
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
 URL: https://en.wikipedia.org/wiki/Util-linux
 
@@ -75,6 +75,10 @@ Provides: util-linux-ng = %{version}-%{release}
 Conflicts: filesystem < 3
 Provides: /sbin/nologin
 Provides: /sbin/findfs
+# util-linux-user was dropped in 2.39-1 and its contents moved back
+# to util-linux
+Obsoletes: util-linux-user < 2.39-1
+Provides: util-linux-user = %{version}-%{release}
 
 Requires(post): coreutils
 Requires: pam >= 1.1.3-7, /etc/pam.d/system-auth
@@ -921,6 +925,9 @@ fi
 
 
 %changelog
+* Thu May 18 2023 Adam Williamson <awilliam@redhat.com> - 2.39-2
+- Have util-linux obsolete and provide util-linux-user
+
 * Thu May 18 2023 Karel Zak <kzak@redhat.com> - 2.39-1
 - upgrade to v2.39
 - remove dependence on libuser