From f3ea361004206c31608e0d3f4c327c964e96cd20 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Fri, 3 Feb 2023 05:04:13 -0600
Subject: [PATCH] Install podman-systemd.unit  man page, make quadlet
 discoverable

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>
---
 Makefile                                      |  3 +++
 docs/source/markdown/links/quadlet.5          |  1 +
 docs/source/markdown/podman-systemd.unit.5.md |  2 +-
 podman.spec.rpkg                              | 26 +++++++------------
 4 files changed, 14 insertions(+), 18 deletions(-)
 create mode 100644 docs/source/markdown/links/quadlet.5

diff --git a/Makefile b/Makefile
index 6d0c55911d..90ad9b628a 100644
--- a/Makefile
+++ b/Makefile
@@ -839,8 +839,11 @@ install.modules-load: # This should only be used by distros which might use ipta
 .PHONY: install.man
 install.man:
 	install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(MANDIR)/man1
+	install ${SELINUXOPT} -d -m 755 $(DESTDIR)$(MANDIR)/man5
 	install ${SELINUXOPT} -m 644 $(filter %.1,$(MANPAGES_DEST)) $(DESTDIR)$(MANDIR)/man1
 	install ${SELINUXOPT} -m 644 docs/source/markdown/links/*1 $(DESTDIR)$(MANDIR)/man1
+	install ${SELINUXOPT} -m 644 $(filter %.5,$(MANPAGES_DEST)) $(DESTDIR)$(MANDIR)/man5
+	install ${SELINUXOPT} -m 644 docs/source/markdown/links/*5 $(DESTDIR)$(MANDIR)/man5
 
 .PHONY: install.completions
 install.completions:
diff --git a/docs/source/markdown/links/quadlet.5 b/docs/source/markdown/links/quadlet.5
new file mode 100644
index 0000000000..1241a235f5
--- /dev/null
+++ b/docs/source/markdown/links/quadlet.5
@@ -0,0 +1 @@
+.so man5/podman-systemd.unit.5
diff --git a/docs/source/markdown/podman-systemd.unit.5.md b/docs/source/markdown/podman-systemd.unit.5.md
index b87cd6af18..b3894971fa 100644
--- a/docs/source/markdown/podman-systemd.unit.5.md
+++ b/docs/source/markdown/podman-systemd.unit.5.md
@@ -2,7 +2,7 @@
 
 ## NAME
 
-podman\-systemd.unit - systemd units using Podman
+podman\-systemd.unit - systemd units using Podman quadlet
 
 ## SYNOPSIS
 
diff --git a/podman.spec.rpkg b/podman.spec.rpkg
index 36571ef33c..d0958c3094 100644
--- a/podman.spec.rpkg
+++ b/podman.spec.rpkg
@@ -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