#2 Remove install-time requirements on systemd
Opened 3 months ago by zbyszek. Modified a month ago
rpms/ zbyszek/unbound remove-systemd-requires  into  master

file modified
+5 -15

@@ -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 @@ 

  %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 @@ 

  

  %package libs

  Summary: Libraries used by the unbound server and client applications

- %{?systemd_requires}

  Requires(pre): shadow-utils

  

  %description libs

@@ -317,17 +315,6 @@ 

  %{?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

@@ -423,6 +410,9 @@ 

  %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

  

no initial comment

I'll rebase and merge this manually because of the lack of response.