3
0
forked from pool/util-linux

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
This commit is contained in:
Stanislav Brabec 2017-09-14 11:58:12 +00:00 committed by Git OBS Bridge
parent 64e9d40647
commit da9c836707
6 changed files with 45 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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