From 78515abc29651c6661dcf41b41929469f816872e0945a7c2cf3b434c8c7d2006 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Fri, 29 Oct 2021 20:33:05 +0000
Subject: [PATCH] Accepting request 927774 from devel:tools:scm

OBS-URL: https://build.opensuse.org/request/show/927774
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/git?expand=0&rev=269
---
 git-daemon.conf | 2 +-
 git.changes     | 7 +++++++
 git.spec        | 7 +++----
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/git-daemon.conf b/git-daemon.conf
index 51851df..86a4815 100644
--- a/git-daemon.conf
+++ b/git-daemon.conf
@@ -1,3 +1,3 @@
 # Type Name ID GECOS [HOME]
-u git-daemon - "git daemon" /var/lib/empty /bin/false
+u git-daemon - "git daemon" /var/lib/empty -
 m git-daemon nogroup
diff --git a/git.changes b/git.changes
index f1158df..9acf3da 100644
--- a/git.changes
+++ b/git.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 20 16:32:02 UTC 2021 - Callum Farmer <gmbr3@opensuse.org>
+
+- Add CONFIG parameter to %sysusers_generate_pre
+- Remove unneeded SHELL in git-daemon.conf
+- Fix sysusers usage in spec file
+
 -------------------------------------------------------------------
 Wed Oct 13 18:09:43 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
 
diff --git a/git.spec b/git.spec
index f5e6961..d4f02c5 100644
--- a/git.spec
+++ b/git.spec
@@ -88,7 +88,6 @@ Recommends:     gitk
 Suggests:       git-daemon
 Suggests:       git-web
 %if 0%{?suse_version} >= 1500
-BuildRequires:  system-user-nobody
 BuildRequires:  sysuser-tools
 %endif
 %if %{with docs}
@@ -248,8 +247,8 @@ Summary:        Simple Server for Git Repositories
 Group:          Development/Tools/Version Control
 Requires:       git-core = %{version}
 Requires(pre):  %fillup_prereq
-%if 0%{?suse_version} >= 1550
-Requires(pre):  group(nobody)
+%if 0%{?suse_version} >= 1500
+Requires(pre):  group(nogroup)
 %sysusers_requires
 %{?systemd_requires}
 %else
@@ -354,7 +353,7 @@ chmod 755 .make
 ./.make -C contrib/subtree/
 
 %if 0%{?suse_version} >= 1500
-%sysusers_generate_pre %{SOURCE11} git-daemon
+%sysusers_generate_pre %{SOURCE11} git-daemon git-daemon.conf
 %endif
 
 %install