From 3eb6f047dca4b5670c71d48c094b1ce601f5db44 Mon Sep 17 00:00:00 2001
From: Todd Zullinger <tmz@pobox.com>
Date: Sat, 23 Jul 2022 15:28:15 -0400
Subject: [PATCH] require systemd-rpm-macros rather than systemd
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The `BuildRequires: systemd` was added in d7389e7 (use systemd instead
of xinetd (bz 737183), 2013-04-30).  Since then, the systemd macros have
been split into a subpackage¹.  Adjust our BuildRequires (with an
exception for EL-7).

Replace `Requires*: systemd` in git-daemon with %{?systemd_requires}.

¹ https://src.fedoraproject.org/rpms/systemd/c/c9030f0 (Split out the
  rpm macros into systemd-rpm-macros subpackage, 2018-11-02),
---
 git.spec | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/git.spec b/git.spec
index 42fb2b8..e7a699d 100644
--- a/git.spec
+++ b/git.spec
@@ -77,7 +77,7 @@
 
 Name:           git
 Version:        2.37.1
-Release:        1%{?rcrev}%{?dist}.1
+Release:        2%{?rcrev}%{?dist}
 Summary:        Fast Version Control System
 License:        GPLv2
 URL:            https://git-scm.com/
@@ -161,8 +161,11 @@ BuildRequires:  perl
 # endif use_perl_interpreter
 BuildRequires:  pkgconfig(bash-completion)
 BuildRequires:  sed
-# For macros
+%if 0%{?fedora} || 0%{?rhel} >= 8
+BuildRequires:  systemd-rpm-macros
+%else
 BuildRequires:  systemd
+%endif
 BuildRequires:  tcl
 BuildRequires:  tk
 BuildRequires:  xz
@@ -360,10 +363,7 @@ Requires:       perl(DBD::SQLite)
 %package daemon
 Summary:        Git protocol daemon
 Requires:       git-core = %{version}-%{release}
-Requires:       systemd
-Requires(post): systemd
-Requires(preun):  systemd
-Requires(postun): systemd
+%{?systemd_requires}
 %description daemon
 The git daemon for supporting git:// access to git repositories
 
@@ -1007,6 +1007,9 @@ rmdir --ignore-fail-on-non-empty "$testdir"
 %{?with_docs:%{_pkgdocdir}/git-svn.html}
 
 %changelog
+* Sat Jul 23 2022 Todd Zullinger <tmz@pobox.com> - 2.37.1-2
+- require systemd-rpm-macros rather than systemd
+
 * Thu Jul 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.37.1-1.1
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild