From 4eef61cd8fe11376e0470ada986ca28884f67bd1 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Jun 20 2023 14:05:51 +0000
Subject: put httpd-core docs in %{docdir}/httpd


When httpd-core was created in d9ddc5d (Try to minimize httpd
dependencies, 2022-03-30), the path to documentation changed.

Restore documentation to %{docdir}/httpd to be consistent with past
releases and easier for users to locate.  Use the %license macro for
LICENSE and NOTICE.

This avoids an issue with the wrong path being listed for the example
instance.conf in httpd.service(1).

---

diff --git a/httpd.spec b/httpd.spec
index 8e8ee8b..857b7b9 100644
--- a/httpd.spec
+++ b/httpd.spec
@@ -24,7 +24,7 @@
 Summary: Apache HTTP Server
 Name: httpd
 Version: 2.4.57
-Release: 1%{?dist}
+Release: 2%{?dist}
 URL: https://httpd.apache.org/
 Source0: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2
 Source1: https://www.apache.org/dist/httpd/httpd-%{version}.tar.bz2.asc
@@ -618,6 +618,12 @@ chmod 755 $RPM_BUILD_ROOT%{_libdir}/httpd/build/vendor-apxs
 # Fix content dir in sysusers file and install it
 install -p -D -m 0644 %{SOURCE49} %{buildroot}%{_sysusersdir}/httpd.conf
 
+# Install documentation in %%{_pkgdocdir} (license files use %%license)
+mkdir -p %{buildroot}%{_pkgdocdir}
+install -p -m 0664 ABOUT_APACHE README CHANGES VERSIONING \
+    docs/conf/extra/*.conf instance.conf server-status.conf \
+    %{buildroot}%{_pkgdocdir}
+
 # Remove unpackaged files
 rm -vf \
       $RPM_BUILD_ROOT%{_libdir}/*.exp \
@@ -711,10 +717,10 @@ exit $rv
 %{_unitdir}/*.socket
 
 %files core
-%doc ABOUT_APACHE README CHANGES LICENSE VERSIONING NOTICE
-%doc docs/conf/extra/*.conf
-%doc instance.conf server-status.conf
-
+%license LICENSE NOTICE
+# NOTE: don't use %%doc, add files to %%{_pkgdocdir} in %%install
+# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_documentation
+%{_pkgdocdir}/
 %{_sysconfdir}/httpd/modules
 %{_sysconfdir}/httpd/logs
 %{_sysconfdir}/httpd/state
@@ -802,7 +808,7 @@ exit $rv
 %files tools
 %{_bindir}/*
 %{_mandir}/man1/*
-%doc LICENSE NOTICE
+%license LICENSE NOTICE
 %exclude %{_bindir}/apxs
 %exclude %{_mandir}/man1/apxs.1*
 
@@ -850,6 +856,9 @@ exit $rv
 %{_rpmconfigdir}/macros.d/macros.httpd
 
 %changelog
+* Sat Jun 17 2023 Todd Zullinger <tmz@pobox.com> - 2.4.57-2
+- put httpd-core docs in %%{docdir}/httpd
+
 * Tue Apr 11 2023 Luboš Uhliarik <luhliari@redhat.com> - 2.4.57-1
 - new version 2.4.57