Use %sysusers_requires_compat to match %sysusers_create_compat

The %sysusers_create_compat RPM macro was introduced in commit
6c2b44a54a, so this is meant to match with that.

It's not clear why the 'Requires(pre)' was added to the flatpak-libs
sub-package in commit b6456a51bb when the actual %pre scriptlet
is part of the main package.  It was likely a mistake.
This commit is contained in:
Debarshi Ray 2022-08-19 19:18:35 +02:00
parent 157d8d1323
commit 06dc464d52

View File

@ -6,7 +6,7 @@
Name: flatpak Name: flatpak
Version: 1.13.3 Version: 1.13.3
Release: 5%{?dist} Release: 6%{?dist}
Summary: Application deployment framework for desktop apps Summary: Application deployment framework for desktop apps
License: LGPLv2+ License: LGPLv2+
@ -59,6 +59,8 @@ BuildRequires: /usr/bin/xdg-dbus-proxy
BuildRequires: /usr/bin/xmlto BuildRequires: /usr/bin/xmlto
BuildRequires: /usr/bin/xsltproc BuildRequires: /usr/bin/xsltproc
%{?sysusers_requires_compat}
Requires: appstream%{?_isa} >= %{appstream_version} Requires: appstream%{?_isa} >= %{appstream_version}
Requires: bubblewrap >= %{bubblewrap_version} Requires: bubblewrap >= %{bubblewrap_version}
Requires: glib2%{?_isa} >= %{glib_version} Requires: glib2%{?_isa} >= %{glib_version}
@ -97,7 +99,6 @@ Summary: Libraries for %{name}
License: LGPLv2+ License: LGPLv2+
Requires: bubblewrap >= %{bubblewrap_version} Requires: bubblewrap >= %{bubblewrap_version}
Requires: ostree%{?_isa} >= %{ostree_version} Requires: ostree%{?_isa} >= %{ostree_version}
Requires(pre): /usr/sbin/useradd
%description libs %description libs
This package contains libflatpak. This package contains libflatpak.
@ -278,6 +279,9 @@ fi
%changelog %changelog
* Fri Aug 19 2022 Debarshi Ray <rishi@fedoraproject.org> - 1.13.3-6
- Use %%sysusers_requires_compat to match %%sysusers_create_compat
* Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.3-5 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.13.3-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild