From daa9774afc2a1c666c551b3d22a68d6de77b0170 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 4 Nov 2018 17:21:46 +0000
Subject: [PATCH] defs-dist.mk: Change HTML*OWNER to wwwrun and HTML*GROUP to
 www

Change HTMLOWNER and HTMLDIROWNER to wwwrun, and HTMLGROUP and HTMLDIRGROUP to
www. This was made necessary by the dokuwiki package, which installs
directories with these file ownerships, and which disallows RPM-installing the
same directories with other ownerships. Might not be a solution for all
packages and platforms.

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 make/defs-dist.mk    | 8 ++++----
 make/projects-dir.mk | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/make/defs-dist.mk b/make/defs-dist.mk
index de92d2f4..1c30b0f4 100644
--- a/make/defs-dist.mk
+++ b/make/defs-dist.mk
@@ -111,11 +111,11 @@ CGIMODE          ?= $(EXEMODE)
 CGIDIROWNER      ?= $(EXEDIROWNER)
 CGIDIRGROUP      ?= $(EXEDIRGROUP)
 CGIDIRMODE       ?= $(EXEDIRMODE)
-HTMLOWNER        ?= root
-HTMLGROUP        ?= root
+HTMLOWNER        ?= wwwrun
+HTMLGROUP        ?= www
 HTMLMODE         ?= 644
-HTMLDIROWNER     ?= root
-HTMLDIRGROUP     ?= root
+HTMLDIROWNER     ?= wwwrun
+HTMLDIRGROUP     ?= www
 HTMLDIRMODE      ?= 755
 SYSTEMDOWNER     ?= root
 SYSTEMDGROUP     ?= root
diff --git a/make/projects-dir.mk b/make/projects-dir.mk
index ca5f0129..3ea7dcf6 100644
--- a/make/projects-dir.mk
+++ b/make/projects-dir.mk
@@ -231,7 +231,7 @@ pkg-exclude-installed:
 pkg-list-groups:
 	@find . -name project.conf | xargs sed '/^ *group *=/!d; s/group *= *//; s/"//g' | sort -u
 
-pkg-release-reinstall: fetch
+pkg-release-reinstall: pull
 
 pkg-release-all:
 	/bin/bash ./packager-client/scripts/packager-client-2.sh