From d1b1b63c4d469e4e865d2074d03700be5383e5f0 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Jun 07 2021 21:14:16 +0000
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.

---

diff --git a/cgit.spec b/cgit.spec
index 5619235..2eddbe6 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 Jun 07 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-6
 - update SELinux README
 - simplify install commands
+- improve httpd config file creation
 
 * Sat Jun 05 2021 Todd Zullinger <tmz@pobox.com> - 1.2.3-5
 - include output of cgit.conf and git/config.mak in build logs