Accepting request 664998 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/664998
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=228

git.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Fri Jan 11 13:32:47 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Do not BuildRequire apache2:
+  + it is only in the build chain for the directory ownership.
+    Let's just own the directories ourselves.
+  + This actually also fixes the issue that installing, then
+    uninstalling git-web, without apache2 being present on the
+    machine, leaves those directories stale on the disk.
+
 -------------------------------------------------------------------
 Sun Dec 16 11:06:03 UTC 2018 - astieger@suse.com
 

git.spec

@@ -54,7 +54,6 @@ Patch6:         git-tcsh-completion-fixes.diff
 # adapt paths in zsh completion (bnc#853183)
 Patch7:         git-zsh-completion-fixes.diff
 Patch8:         git-asciidoc.patch
-BuildRequires:  apache2
 BuildRequires:  curl
 BuildRequires:  fdupes
 BuildRequires:  gpg2
@@ -494,6 +493,8 @@ fi
 
 %files web
 %doc README.gitweb INSTALL.gitweb
+%dir %{_sysconfdir}/apache2
+%dir %{_sysconfdir}/apache2/conf.d/
 %config(noreplace) %{_sysconfdir}/apache2/conf.d/gitweb.conf
 %{_datadir}/gitweb
 %{_sysconfdir}/apparmor.d