From 556b4a03d383b53bf472301365d9a60f33f55a2e Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Thu, 15 Mar 2018 22:00:01 -0400
Subject: [PATCH] Rename gitweb httpd config file

The gitweb httpd config file was added long before git gained support
for smart http, in c97cf8e ("Add git-daemon and gitweb packages",
2007-08-04).

Now, users who want to enable git's smart http support with apache will
often want to use /etc/httpd/conf.d/git.conf as the path.

Make this easier by giving the gitweb httpd config file a more logical
name going forward.  Keep the current config file name in previous
releases.
---
 git.spec                            | 18 +++++++++++++-----
 git.conf.httpd => gitweb-httpd.conf |  0
 2 files changed, 13 insertions(+), 5 deletions(-)
 rename git.conf.httpd => gitweb-httpd.conf (100%)

diff --git a/git.spec b/git.spec
index 6923989..17b20a0 100644
--- a/git.spec
+++ b/git.spec
@@ -3,6 +3,13 @@
 
 %global gitexecdir          %{_libexecdir}/git-core
 
+# Settings for Fedora >= 29 and EL > 7
+%if 0%{?fedora} >= 29 || 0%{?rhel} > 7
+%global gitweb_httpd_conf   gitweb.conf
+%else
+%global gitweb_httpd_conf   git.conf
+%endif
+
 # Settings for Fedora and EL > 7
 %if 0%{?fedora} || 0%{?rhel} > 7
 %global with_python3        1
@@ -74,8 +81,8 @@ Source9:        gpgkey-junio.asc
 # Local sources begin at 10 to allow for additional future upstream sources
 Source10:       git-init.el
 Source11:       git.xinetd.in
-Source12:       git.conf.httpd
-Source13:       git-gui.desktop
+Source12:       git-gui.desktop
+Source13:       gitweb-httpd.conf
 Source14:       gitweb.conf.in
 Source15:       git@.service.in
 Source16:       git.socket
@@ -480,7 +487,7 @@ install -pm 755 contrib/credential/netrc/git-credential-netrc \
 make -C contrib/subtree install %{?with_docs:install-doc}
 
 mkdir -p %{buildroot}%{_sysconfdir}/httpd/conf.d
-install -pm 0644 %{SOURCE12} %{buildroot}%{_sysconfdir}/httpd/conf.d/git.conf
+install -pm 0644 %{SOURCE13} %{buildroot}%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf}
 sed "s|@PROJECTROOT@|%{_localstatedir}/lib/git|g" \
     %{SOURCE14} > %{buildroot}%{_sysconfdir}/gitweb.conf
 
@@ -544,7 +551,7 @@ install -pm 644 contrib/completion/git-prompt.sh \
     %{buildroot}%{_datadir}/git-core/contrib/completion/
 
 # install git-gui .desktop file
-desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE13}
+desktop-file-install --dir=%{buildroot}%{_datadir}/applications %{SOURCE12}
 
 # find translations
 %find_lang %{name} %{name}.lang
@@ -752,7 +759,7 @@ make test || ./print-failed-test-output
 %{_pkgdocdir}/gitweb*.txt
 %{?with_docs:%{_pkgdocdir}/gitweb*.html}
 %config(noreplace)%{_sysconfdir}/gitweb.conf
-%config(noreplace)%{_sysconfdir}/httpd/conf.d/git.conf
+%config(noreplace)%{_sysconfdir}/httpd/conf.d/%{gitweb_httpd_conf}
 %{_localstatedir}/www/git/
 
 %files gui
@@ -796,6 +803,7 @@ make test || ./print-failed-test-output
 - Update to 2.17.0-rc0
 - Adjust for simplified perl install
 - Require git-core rather than git for git-daemon
+- Rename gitweb httpd config file
 
 * Thu Mar 15 2018 Todd Zullinger <tmz@pobox.com>
 - Use symlinks instead of hardlinks for installed binaries
diff --git a/git.conf.httpd b/gitweb-httpd.conf
similarity index 100%
rename from git.conf.httpd
rename to gitweb-httpd.conf