From aec815b4f78a1e6b49ad0a8ccb7c78a7ac45d2bb Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jun 26 2019 08:33:57 +0000
Subject: [PATCH 1/2] Drop build-time and install-time requirements on systemd


This follows the semi-recent guideline changes:
https://pagure.io/packaging-committee/pull-request/828
https://pagure.io/packaging-committee/pull-request/890#comment-86419

---

diff --git a/unbound.spec b/unbound.spec
index c3248e3..011ab77 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -34,7 +34,7 @@
 Summary: Validating, recursive, and caching DNS(SEC) resolver
 Name: unbound
 Version: 1.8.3
-Release: 4%{?extra_version:.%{extra_version}}%{?dist}
+Release: 5%{?extra_version:.%{extra_version}}%{?dist}
 License: BSD
 Url: https://www.unbound.net/
 Source: https://www.unbound.net/downloads/%{name}-%{version}%{?extra_version}.tar.gz
@@ -67,12 +67,11 @@ BuildRequires: python2-devel swig
 %if 0%{with_python3}
 BuildRequires: python3-devel swig
 %endif # with_python3
-BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
 # Required for SVN versions
 # BuildRequires: bison
 # BuildRequires: automake autoconf libtool
 
-%{?systemd_requires}
 # Needed because /usr/sbin/unbound links unbound libs staticly
 Requires: %{name}-libs%{?_isa} = %{version}-%{release}
 
@@ -108,7 +107,6 @@ The devel package contains the unbound library and the include files
 
 %package libs
 Summary: Libraries used by the unbound server and client applications
-%{?systemd_requires}
 Requires(pre): shadow-utils
 
 %description libs
@@ -423,6 +421,9 @@ popd
 %attr(0644,root,root) %config %{_sysconfdir}/%{name}/root.key
 
 %changelog
+* Wed Jun 26 2019 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 1.8.3-5
+- Drop install-time requirements on systemd (#1723777)
+
 * Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.8.3-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
 

From 0ac1bbfd982c50701488ebbb039adbfa151defd7 Mon Sep 17 00:00:00 2001
From: Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Date: Jun 26 2019 08:33:57 +0000
Subject: [PATCH 2/2] Remove very old trigger


systemd-sysv-convert was removed many years ago.

---

diff --git a/unbound.spec b/unbound.spec
index 011ab77..1a1345b 100644
--- a/unbound.spec
+++ b/unbound.spec
@@ -315,17 +315,6 @@ fi
 %{?ldconfig}
 %systemd_postun_with_restart unbound-anchor.timer
 
-%triggerun -- unbound < 1.4.12-4
-# Save the current service runlevel info
-# User must manually run systemd-sysv-convert --apply unbound
-# to migrate them to systemd targets
-/usr/bin/systemd-sysv-convert --save unbound >/dev/null 2>&1 ||:
-
-# Run these because the SysV package being removed won't do them
-/sbin/chkconfig --del unbound >/dev/null 2>&1 || :
-/bin/systemctl try-restart unbound.service >/dev/null 2>&1 || :
-/bin/systemctl try-restart unbound-keygen.service >/dev/null 2>&1 || :
-
 %check
 pushd %{dir_primary}
 #pushd pythonmod