rpms/containers-common
7
0
Fork 0
Code Issues Pull Requests Releases Activity

resolve docker manpage conflicts

Browse Source 
With this change, docker manpages will be generated at rpm install time
via %post only if %{_bindir}/docker isn't found on the system.

Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
This commit is contained in:
Lokesh Mandvekar 2022-02-01 15:45:14 -05:00
parent 69b9328f17
commit 2d5f45149b
1 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
containers-common.spec
View File

@ -96,9 +96,6 @@ for FILE in $(ls *.5.md); do
done done
cp man5/containerignore.5 man5/.containerignore.5 cp man5/containerignore.5 man5/.containerignore.5
echo .so man5/Containerfile.5 > man5/Dockerfile.5
echo .so man5/containerignore.5 > man5/.dockerignore.5
echo .so man5/containerignore.5 > man5/dockerignore.5
%install %install
# install config and policy files for registries # install config and policy files for registries
@ -130,6 +127,14 @@ ln -s %{_sysconfdir}/pki/entitlement %{buildroot}%{_datadir}/rhel/secrets/etc-pk
ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm ln -s %{_sysconfdir}/rhsm %{buildroot}%{_datadir}/rhel/secrets/rhsm
ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/redhat.repo ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secrets/redhat.repo
%post
if [[ ! -f %{_bindir}/docker ]]; then
echo .so %{_mandir}/man5/Containerfile.5 > %{_mandir}/man5/Dockerfile.5
echo .so %{_mandir}/man5/containerignore.5 > %{_mandir}/man5/.dockerignore.5
echo .so %{_mandir}/man5/containerignore.5 > %{_mandir}/man5/dockerignore.5
gzip %{_mandir}/man5/{Dockerfile,.dockerignore,dockerignore}.5
fi
%files %files
%dir %{_sysconfdir}/containers %dir %{_sysconfdir}/containers
%dir %{_sysconfdir}/containers/certs.d %dir %{_sysconfdir}/containers/certs.d
@ -147,8 +152,13 @@ ln -s %{_sysconfdir}/yum.repos.d/redhat.repo %{buildroot}%{_datadir}/rhel/secret
%ghost %{_sysconfdir}/containers/storage.conf %ghost %{_sysconfdir}/containers/storage.conf
%ghost %{_sysconfdir}/containers/containers.conf %ghost %{_sysconfdir}/containers/containers.conf
%dir %{_sharedstatedir}/containers/sigstore %dir %{_sharedstatedir}/containers/sigstore
%{_mandir}/man5/*.5.* %ghost %{_mandir}/man5/Dockerfile.5.gz
%{_mandir}/man5/.*.5.* %ghost %{_mandir}/man5/dockerignore.5.gz
%ghost %{_mandir}/man5/.dockerignore.5.gz
%{_mandir}/man5/Containerfile.5.gz
%{_mandir}/man5/containerignore.5.gz
%{_mandir}/man5/.containerignore.5.gz
%{_mandir}/man5/containers*.5.gz
%dir %{_datadir}/containers %dir %{_datadir}/containers
%{_datadir}/containers/storage.conf %{_datadir}/containers/storage.conf
%{_datadir}/containers/containers.conf %{_datadir}/containers/containers.conf