From da9c836707953ff49801ffd1d779532980deafeb2de13a2280abad26868fad70 Mon Sep 17 00:00:00 2001
From: Stanislav Brabec <sbrabec@suse.com>
Date: Thu, 14 Sep 2017 11:58:12 +0000
Subject: [PATCH] Accepting request 523679 from
 home:sbrabec:branches:util-linux-1057937

Depends on rq#523677.
- Fix prerequirement of groups tty and uuidd (boo#1057937).

OBS-URL: https://build.opensuse.org/request/show/523679
OBS-URL: https://build.opensuse.org/package/show/Base:System/util-linux?expand=0&rev=347
---
 python-libmount.changes    |  5 +++++
 python-libmount.spec       | 12 ++++++++++--
 util-linux-systemd.changes |  5 +++++
 util-linux-systemd.spec    | 12 ++++++++++--
 util-linux.changes         |  5 +++++
 util-linux.spec            | 12 ++++++++++--
 6 files changed, 45 insertions(+), 6 deletions(-)

diff --git a/python-libmount.changes b/python-libmount.changes
index 7b9f2ee..ebafa17 100644
--- a/python-libmount.changes
+++ b/python-libmount.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com
+
+- Fix prerequirement of groups tty and uuidd (boo#1057937).
+
 -------------------------------------------------------------------
 Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de
 
diff --git a/python-libmount.spec b/python-libmount.spec
index 565578f..725826e 100644
--- a/python-libmount.spec
+++ b/python-libmount.spec
@@ -162,7 +162,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %build_util_linux
 Supplements:    filesystem(minix)
 %if 0%{?suse_version} >= 1330
-Requires:       group(tty)
+Requires(pre):  group(tty)
 %endif
 Provides:       fsck-with-dev-lock = %{version}
 # bnc#651598:
@@ -383,8 +383,12 @@ This package contains low-level util-linux utilities that use systemd.
 %package -n uuidd
 Summary:        Helper daemon to guarantee uniqueness of time-based UUIDs
 Group:          System/Filesystems
+%if 0%{?suse_version} >= 1330
+Requires(pre):  group(uuidd)
+%else
 Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/sbin/useradd
+%endif
 # uuidd bash-completion moved to a correct package
 Conflicts:      util-linux < 2.25
 %systemd_requires
@@ -850,10 +854,14 @@ done
 %postun -n util-linux-systemd
 %{service_del_postun fstrim.service fstrim.timer}
 
-%pre -p /bin/bash -n uuidd
+%if 0%{?suse_version} >= 1330
+%pre -n uuidd
+%else
+%pre -n uuidd
 /usr/sbin/groupadd -r uuidd 2>/dev/null || :
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
   -d /var/run/uuidd uuidd 2>/dev/null || :
+%endif
 %{service_add_pre uuidd.socket uuidd.service}
 
 %post -n uuidd
diff --git a/util-linux-systemd.changes b/util-linux-systemd.changes
index 7b9f2ee..ebafa17 100644
--- a/util-linux-systemd.changes
+++ b/util-linux-systemd.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com
+
+- Fix prerequirement of groups tty and uuidd (boo#1057937).
+
 -------------------------------------------------------------------
 Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de
 
diff --git a/util-linux-systemd.spec b/util-linux-systemd.spec
index 11a0146..79de592 100644
--- a/util-linux-systemd.spec
+++ b/util-linux-systemd.spec
@@ -162,7 +162,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %build_util_linux
 Supplements:    filesystem(minix)
 %if 0%{?suse_version} >= 1330
-Requires:       group(tty)
+Requires(pre):  group(tty)
 %endif
 Provides:       fsck-with-dev-lock = %{version}
 # bnc#651598:
@@ -383,8 +383,12 @@ This package contains low-level util-linux utilities that use systemd.
 %package -n uuidd
 Summary:        Helper daemon to guarantee uniqueness of time-based UUIDs
 Group:          System/Filesystems
+%if 0%{?suse_version} >= 1330
+Requires(pre):  group(uuidd)
+%else
 Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/sbin/useradd
+%endif
 # uuidd bash-completion moved to a correct package
 Conflicts:      util-linux < 2.25
 %systemd_requires
@@ -850,10 +854,14 @@ done
 %postun -n util-linux-systemd
 %{service_del_postun fstrim.service fstrim.timer}
 
-%pre -p /bin/bash -n uuidd
+%if 0%{?suse_version} >= 1330
+%pre -n uuidd
+%else
+%pre -n uuidd
 /usr/sbin/groupadd -r uuidd 2>/dev/null || :
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
   -d /var/run/uuidd uuidd 2>/dev/null || :
+%endif
 %{service_add_pre uuidd.socket uuidd.service}
 
 %post -n uuidd
diff --git a/util-linux.changes b/util-linux.changes
index 7b9f2ee..ebafa17 100644
--- a/util-linux.changes
+++ b/util-linux.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Sep 12 12:35:34 CEST 2017 - sbrabec@suse.com
+
+- Fix prerequirement of groups tty and uuidd (boo#1057937).
+
 -------------------------------------------------------------------
 Thu Jul 20 13:51:20 UTC 2017 - sweet_f_a@gmx.de
 
diff --git a/util-linux.spec b/util-linux.spec
index f88d284..d5c3687 100644
--- a/util-linux.spec
+++ b/util-linux.spec
@@ -162,7 +162,7 @@ BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %if %build_util_linux
 Supplements:    filesystem(minix)
 %if 0%{?suse_version} >= 1330
-Requires:       group(tty)
+Requires(pre):  group(tty)
 %endif
 Provides:       fsck-with-dev-lock = %{version}
 # bnc#651598:
@@ -383,8 +383,12 @@ This package contains low-level util-linux utilities that use systemd.
 %package -n uuidd
 Summary:        Helper daemon to guarantee uniqueness of time-based UUIDs
 Group:          System/Filesystems
+%if 0%{?suse_version} >= 1330
+Requires(pre):  group(uuidd)
+%else
 Requires(pre):  /usr/sbin/groupadd
 Requires(pre):  /usr/sbin/useradd
+%endif
 # uuidd bash-completion moved to a correct package
 Conflicts:      util-linux < 2.25
 %systemd_requires
@@ -850,10 +854,14 @@ done
 %postun -n util-linux-systemd
 %{service_del_postun fstrim.service fstrim.timer}
 
-%pre -p /bin/bash -n uuidd
+%if 0%{?suse_version} >= 1330
+%pre -n uuidd
+%else
+%pre -n uuidd
 /usr/sbin/groupadd -r uuidd 2>/dev/null || :
 /usr/sbin/useradd -r -g uuidd -c "User for uuidd" \
   -d /var/run/uuidd uuidd 2>/dev/null || :
+%endif
 %{service_add_pre uuidd.socket uuidd.service}
 
 %post -n uuidd