From 9c9fb96594bc44677d6f6df6b5a3d8c1902d704f9ef98d2b92f722544c939b84 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 21 Jan 2019 09:08:17 +0000 Subject: [PATCH] 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 | 10 ++++++++++ git.spec | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/git.changes b/git.changes index b596a66..d42d0b8 100644 --- a/git.changes +++ b/git.changes @@ -1,3 +1,13 @@ +------------------------------------------------------------------- +Fri Jan 11 13:32:47 UTC 2019 - Dominique Leuenberger + +- 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 diff --git a/git.spec b/git.spec index d40da60..2e41bbc 100644 --- a/git.spec +++ b/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