New subject: [OS-BUILD PATCH] rpmspec: add release string to kernel doc directory name

21 Jul 2021

From: Jan Stancek jstancek@redhat.com
rpmspec: add release string to kernel doc directory name
https://fedoraproject.org//wiki/Changes/UnversionedDocdirs says:
  Packages for which multiple versions are intended to be installed need to
  be changed to install their docs into appropriately versioned subdirs.
kernel docs are currently installed to /usr/share/doc/kernel-doc-$VERSION
(for example: /usr/share/doc/kernel-doc-5.14.0), which prevents user
from having kernel docs installed for multiple releases if they happen
to share same $VERSION. This is more visible in downstream releases,
where $VERSION is same for entire lifetime of stream.
This patch adds $RELEASE to kernel doc directory name to allow installing
multiple versions in parallel.
Signed-off-by: Jan Stancek jstancek@redhat.com

diff --git a/redhat/kernel.spec.template b/redhat/kernel.spec.template
index blahblah..blahblah 100755
--- a/redhat/kernel.spec.template
+++ b/redhat/kernel.spec.template
@@ -2321,7 +2321,7 @@ find Documentation -type d | xargs chmod u+w
 cd linux-%{KVERREL}
%if %{with_doc}
-docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}
+docdir=$RPM_BUILD_ROOT%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
# copy the source over
 mkdir -p $docdir
@@ -2706,9 +2706,9 @@ fi
 %if %{with_doc}
 %files doc
 %defattr(-,root,root)
-%{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation/*
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}/Documentation
-%dir %{_datadir}/doc/kernel-doc-%{rpmversion}
+%{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation/*
+%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}/Documentation
+%dir %{_datadir}/doc/kernel-doc-%{rpmversion}-%{pkgrelease}
 %endif
%if %{with_perf}
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/1258

    