From b726ae307f3f3d44177994e29851459064751646 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Mon, 7 Jun 2021 01:33:34 -0400
Subject: improve httpd config file creation

Remove the needless %dist conditional, all supported Fedora and EPEL
releases use httpd-2.4.

Use macros consistently within the httpd.conf file.

Set the timestamp of the httpd.conf to match the README from the
tarball to keep it consistent across builds.
---
 cgit.spec | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'cgit.spec')

diff --git a/cgit.spec b/cgit.spec
index 605008d..6c4c1f2 100644
--- a/cgit.spec
+++ b/cgit.spec
@@ -163,15 +163,14 @@ grep -rl '#!.*/env' filters/ | xargs -r sed -Ei 's@^(.+/)env (.+)$@\1\2@'
 find contrib -type f | xargs -r chmod -x
 
 # default httpd config
-cat > httpd.conf <<EOF
-Alias /cgit-data /usr/share/cgit
-ScriptAlias /cgit /var/www/cgi-bin/cgit
-%if 0%{?fedora} || 0%{?rhel} >= 7
-<Directory "/usr/share/cgit">
+cat >httpd.conf <<EOF
+Alias /%{name}-data %{cgitdata}
+ScriptAlias /%{name} %{scriptdir}/%{name}
+<Directory "%{cgitdata}">
     Require all granted
 </Directory>
-%endif
 EOF
+touch -r README httpd.conf
 
 
 %build
@@ -216,6 +215,7 @@ make test
 * Mon Jul 26 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-7
 - update SELinux README
 - simplify install commands
+- improve httpd config file creation
 
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2.3-6
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-- 
cgit