diff --git a/anda/misc/katsu-systemd-sysusers-presets/anda.hcl b/anda/misc/katsu-systemd-sysusers-presets/anda.hcl deleted file mode 100644 index 9d6e4d9a58..0000000000 --- a/anda/misc/katsu-systemd-sysusers-presets/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "katsu-systemd-sysusers-presets.spec" - } -} diff --git a/anda/misc/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec b/anda/misc/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec deleted file mode 100644 index 66dc5d69cb..0000000000 --- a/anda/misc/katsu-systemd-sysusers-presets/katsu-systemd-sysusers-presets.spec +++ /dev/null @@ -1,72 +0,0 @@ -%define debug_package %nil - -Name: katsu-systemd-sysusers-presets -Version: 1.0 -Release: %autorelease -Summary: A set of systemd system user presets to supplement Fedora's defaults, used by Katsu -License: GPLv3+ -Source0: polkit.conf -Source1: rpcbind.conf -BuildRequires: systemd-rpm-macros -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - - -%description -A set of systemd system user presets to supplement Fedora's defaults, -Since for some packages, the system users are created using the package's -post-install script, this package is a no-op on its own. It is intended to be -used as a dependency for other packages that need to create system users. -For example, Polkit needs to create the polkitd system user, so this package -generates the polkitd system user for Polkit to use properly. - -Katsu uses this package to fix Fedora's default system user presets, which -fails to add the system users for Polkit and rpcbind. - -%package polkit -Summary: Polkit system user -Requires: rpcbind - -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - -Supplements: polkit - -%description polkit -Polkit system user preset - -%package rpcbind -Summary: RPC bind system user -Requires: rpcbind - -Requires(post): systemd -Requires(preun): systemd -Requires(postun): systemd - -Supplements: rpcbind - -%description rpcbind -RPC bind system user preset - -%prep - -%install -install -D %{SOURCE0} %{buildroot}%{_sysusersdir}/katsu-polkit.conf -install -D %{SOURCE1} %{buildroot}%{_sysusersdir}/katsu-rpcbind.conf - -%post polkit -systemd-sysusers %{_sysusersdir}/katsu-polkit.conf - -%post rpcbind -systemd-sysusers %{_sysusersdir}/katsu-rpcbind.conf - - -%files polkit -%{_sysusersdir}/katsu-polkit.conf -%files rpcbind -%{_sysusersdir}/katsu-rpcbind.conf - -%changelog -%autochangelog \ No newline at end of file diff --git a/anda/misc/katsu-systemd-sysusers-presets/polkit.conf b/anda/misc/katsu-systemd-sysusers-presets/polkit.conf deleted file mode 100644 index ae85edf105..0000000000 --- a/anda/misc/katsu-systemd-sysusers-presets/polkit.conf +++ /dev/null @@ -1,2 +0,0 @@ -g polkitd 114 -u polkitd 114:114 "User for polkitd" - - \ No newline at end of file diff --git a/anda/misc/katsu-systemd-sysusers-presets/rpcbind.conf b/anda/misc/katsu-systemd-sysusers-presets/rpcbind.conf deleted file mode 100644 index 755a961397..0000000000 --- a/anda/misc/katsu-systemd-sysusers-presets/rpcbind.conf +++ /dev/null @@ -1,2 +0,0 @@ -g rpc 32 -u rpc 32:32 "Rpcbind Daemon" - - \ No newline at end of file diff --git a/anda/misc/systemd-sysusers-presets/anda.hcl b/anda/misc/systemd-sysusers-presets/anda.hcl deleted file mode 100644 index 692859d141..0000000000 --- a/anda/misc/systemd-sysusers-presets/anda.hcl +++ /dev/null @@ -1,5 +0,0 @@ -project pkg { - rpm { - spec = "systemd-sysusers-presets.spec" - } -} diff --git a/anda/misc/systemd-sysusers-presets/polkit.conf b/anda/misc/systemd-sysusers-presets/polkit.conf deleted file mode 100644 index ae85edf105..0000000000 --- a/anda/misc/systemd-sysusers-presets/polkit.conf +++ /dev/null @@ -1,2 +0,0 @@ -g polkitd 114 -u polkitd 114:114 "User for polkitd" - - \ No newline at end of file diff --git a/anda/misc/systemd-sysusers-presets/rpcbind.conf b/anda/misc/systemd-sysusers-presets/rpcbind.conf deleted file mode 100644 index 755a961397..0000000000 --- a/anda/misc/systemd-sysusers-presets/rpcbind.conf +++ /dev/null @@ -1,2 +0,0 @@ -g rpc 32 -u rpc 32:32 "Rpcbind Daemon" - - \ No newline at end of file diff --git a/anda/misc/systemd-sysusers-presets/systemd-sysusers-presets.spec b/anda/misc/systemd-sysusers-presets/systemd-sysusers-presets.spec deleted file mode 100644 index f7655fdc57..0000000000 --- a/anda/misc/systemd-sysusers-presets/systemd-sysusers-presets.spec +++ /dev/null @@ -1,58 +0,0 @@ -%define debug_package %nil - -Name: systemd-sysusers-presets -Version: 1.0 -Release: %autorelease -Summary: A set of systemd system user presets to supplement Fedora's defaults -License: GPLv3+ -Source0: polkit.conf -Source1: rpcbind.conf -BuildRequires: systemd-rpm-macros -%{?systemd_requires} - -%description -A set of systemd system user presets to supplement Fedora's defaults, -Since for some packages, the system users are created using the package's -post-install script, this package is a no-op on its own. It is intended to be -used as a dependency for other packages that need to create system users. -For example, Polkit needs to create the polkitd system user, so this package -generates the polkitd system user for Polkit to use properly. - -%package polkit -Summary: Polkit system user -Requires: rpcbind -%{?systemd_requires} -Supplements: polkit - -%description polkit -Polkit system user preset - -%package rpcbind -Summary: RPC bind system user -Requires: rpcbind -%{?systemd_requires} -Supplements: rpcbind - -%description rpcbind -RPC bind system user preset - -%prep - -%install -install -D %{SOURCE0} %{buildroot}%{_sysusersdir}/polkit.conf -install -D %{SOURCE1} %{buildroot}%{_sysusersdir}/rpcbind.conf - -%post polkit -systemd-sysusers %{_sysusersdir}/polkit.conf - -%post rpcbind -systemd-sysusers %{_sysusersdir}/rpcbind.conf - - -%files polkit -%{_sysusersdir}/polkit.conf -%files rpcbind -%{_sysusersdir}/rpcbind.conf - -%changelog -%autochangelog diff --git a/anda/terra/obsolete/terra-obsolete.spec b/anda/terra/obsolete/terra-obsolete.spec index ad82e6fba6..cfc2e12514 100644 --- a/anda/terra/obsolete/terra-obsolete.spec +++ b/anda/terra/obsolete/terra-obsolete.spec @@ -110,6 +110,14 @@ BuildArch: noarch %obsolete_ticket https://github.com/terrapkg/packages/pull/994 %obsolete switchboard-plug-wallet 50582fc-3 +%obsolete_ticket https://github.com/terrapkg/packages/pull/1000 +%obsolete systemd-sysusers-presets 1.0-2 +%obsolete systemd-sysusers-presets-polkit 1.0-2 +%obsolete systemd-sysusers-presets-rpcbind 1.0-2 +%obsolete katsu-systemd-sysusers-presets 1.0-2 +%obsolete katsu-systemd-sysusers-presets-polkit 1.0-2 +%obsolete katsu-systemd-sysusers-presets-rpcbind 1.0-2 + %description Currently obsoleted packages: