opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-07-25 09:05:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Install podman-systemd.unit man page, make quadlet discoverable

Browse Source 
Currently we are shipping no data about quadlet, since the
podman-systemd.unit file is not shipped. Also want to add the
quadlet name to the description of the man page so that

man -k quadlet

will help users find the man page.

Also add a link file such that if the user types in
man quadlet
man will show the podman-systemd.unit file.

Also eliminate the subpackage podman-quadlet

Fixes: https://github.com/containers/podman/issues/17349

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2023-02-03 05:04:13 -06:00
parent 3654a26421
commit 3c3526e532
4 changed files with 14 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
podman.spec.rpkg
View File

@ -84,6 +84,10 @@ Requires: iptables
Requires: nftables
Recommends: catatonit
Suggests: qemu-user-static
Conflicts: quadlet
Provides: %{name}-quadlet
Obsoletes: %{name}-quadlet <= 101:0.0.git.17877.f247b4d4-1
Provides: %{name}-quadlet = %{epoch}:%{version}-%{release}
# More detailed description of the package
%description
@ -141,17 +145,6 @@ Remote client for managing %{name} containers.
manage pods, containers and container images. %{name}-remote supports ssh
connections as well.
%package quadlet
Summary: Easily create systemd services using %{name}
Requires: %{name} = %{epoch}:%{version}-%{release}
Conflicts: quadlet
%description quadlet
This package installs a systemd generator for *.container files in
/etc/containers/systemd. Such files are automatically converted into
systemd service units, allowing easily written and maintained
podman-based system services.
# The following four sections already describe the rpm build process itself.
# prep will extract the tarball defined as Source above and descend into it.
%prep
@ -240,6 +233,9 @@ fi
%{_bindir}/%{name}
%dir %{_libexecdir}/%{name}
%{_libexecdir}/%{name}/rootlessport
%{_libexecdir}/%{name}/quadlet
%{_systemdgeneratordir}/%{name}-system-generator
%{_systemdusergeneratordir}/%{name}-user-generator
%{_datadir}/bash-completion/completions/%{name}
# By "owning" the site-functions dir, we don't need to Require zsh
%dir %{_datadir}/zsh/site-functions
@ -261,6 +257,8 @@ fi
%{_userunitdir}/%{name}-kube@.service
%{_tmpfilesdir}/%{name}.conf
%{_user_tmpfilesdir}/%{name}-docker.conf
%{_mandir}/man5/quadlet*.5*
%{_mandir}/man5/podman-systemd.unit*.5*
%if 0%{?fedora} >= 36
%{_modulesloaddir}/%{name}-iptables.conf
%endif
@ -271,12 +269,6 @@ fi
%{_mandir}/man5/docker*.5*
%{_usr}/lib/tmpfiles.d/%{name}-docker.conf
%files quadlet
%license LICENSE
%{_libexecdir}/%{name}/quadlet
%_prefix/lib/systemd/system-generators/podman-system-generator
%_prefix/lib/systemd/user-generators/podman-user-generator
%files remote
%license LICENSE
%{_bindir}/%{name}-remote