Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package git for openSUSE:Factory checked in
at 2021-04-18 21:44:54
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/git (Old)
and /work/SRC/openSUSE:Factory/.git.new.12324 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "git"
Sun Apr 18 21:44:54 2021 rev:262 rq:885634 version:2.31.1
Changes:
--------
--- /work/SRC/openSUSE:Factory/git/git.changes 2021-04-10 15:26:35.614323139
+0200
+++ /work/SRC/openSUSE:Factory/.git.new.12324/git.changes 2021-04-18
21:45:04.540718314 +0200
@@ -1,0 +2,5 @@
+Fri Apr 9 11:34:14 UTC 2021 - Frederic Crozat <fcro...@suse.com>
+
+- Add sysusers file to create git-daemon user.
+
+-------------------------------------------------------------------
New:
----
git-daemon.conf
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ git.spec ++++++
--- /var/tmp/diff_new_pack.K9cCTR/_old 2021-04-18 21:45:05.220719464 +0200
+++ /var/tmp/diff_new_pack.K9cCTR/_new 2021-04-18 21:45:05.224719471 +0200
@@ -52,6 +52,7 @@
Source8: %{name}.keyring
Source9: %{name}-gui.desktop
Source10: %{name}-gui.png
+Source11: git-daemon.conf
# PATCH-FIX-SUSE: Default to builtin add -i mode to avoid perl dependency
Patch2: suse-use-builtin-add-interactive.patch
Patch3: completion-wordbreaks.diff
@@ -73,6 +74,10 @@
BuildRequires: perl-MailTools
BuildRequires: python3-base
BuildRequires: systemd-rpm-macros
+%if 0%{?suse_version} >= 1500
+BuildRequires: system-user-nobody
+BuildRequires: sysuser-tools
+%endif
BuildRequires: tcsh
BuildRequires: update-desktop-files
BuildRequires: xz
@@ -241,14 +246,16 @@
%package daemon
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)
+%sysusers_requires
+%{?systemd_requires}
+%else
Requires(pre): %{_sbindir}/useradd
Requires(pre): shadow
-%{?systemd_requires}
-%if 0%{?suse_version} >= 1500
-Requires(pre): group(nogroup)
%endif
+Requires: git-core = %{version}
+Requires(pre): %fillup_prereq
%description daemon
A really simple TCP git daemon. In the default configuration it allows
@@ -346,6 +353,10 @@
%endif
./.make -C contrib/subtree/
+%if 0%{?suse_version} >= 1500
+%sysusers_generate_pre %{SOURCE11} git-daemon
+%endif
+
%install
./.make install %{!?_without_docs: install-doc}
### git-web
@@ -427,6 +438,11 @@
install -m 644 %{SOURCE10} %{buildroot}%{_datadir}/pixmaps
%suse_update_desktop_file
%{buildroot}%{_datadir}/applications/%{name}-gui.desktop
+%if 0%{?suse_version} >= 1500
+mkdir -p %{buildroot}%{_sysusersdir}
+install -m 0644 %{SOURCE11} %{buildroot}%{_sysusersdir}/
+%endif
+
%find_lang %{name}
cat %{name}.lang >>bin-man-doc-files
# use symlinks instead of hardlinks in sub-commands
@@ -435,10 +451,14 @@
%check
./.make %{?_smp_mflags} test
+%if 0%{?suse_version} >= 1500
+%pre daemon -f git-daemon.pre
+%else
%pre daemon
if ! %{_bindir}/getent passwd git-daemon >/dev/null; then
%{_sbindir}/useradd -r -d %{_localstatedir}/lib/empty -s /bin/false -c "git
daemon" -g nogroup git-daemon
fi
+%endif
%service_add_pre git-daemon.service
%post daemon
@@ -502,6 +522,9 @@
%if 0%{?SuSEfirewall2}
%config %{_fwdefdir}/*
%endif
+%if 0%{?suse_version} >= 1500
+%{_sysusersdir}/git-daemon.conf
+%endif
%files -n gitk
%{_bindir}/gitk
++++++ git-daemon.conf ++++++
# Type Name ID GECOS [HOME]
u git-daemon - "git daemon" /var/lib/empty /bin/false
m git-daemon nogroup
