[rpms/inn] epel10: Merge branch 'f34' into rawhide

[rpms/inn] epel10: Merge branch 'f34' into rawhide

[Dominik 'Rathann' Mierzejewski]

A new commit has been pushed.

Repo   : rpms/inn
Branch : epel10
Commit : c2bd95dc4b99d7c335f34d806a670337d2b229b6
Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
Date   : 2021-03-15T09:57:59+01:00
Stats  : +16/-25 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/inn/c/c2bd95dc4b99d7c335f34d806a670337d2b229b6?branch=epel10

Log:
Merge branch 'f34' into rawhide

---
diff --git a/inn.spec b/inn.spec
index d0e7a02..818ea8d 100644
--- a/inn.spec
+++ b/inn.spec
@@ -7,8 +7,8 @@ Release: 4%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 URL: https://www.eyrie.org/~eagle/software/inn/
-Source0: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz
-Source1: ftp://ftp.isc.org/isc/inn/inn-%{version}.tar.gz.asc
+Source0: https://downloads.isc.org/isc/inn/inn-%{version}.tar.gz
+Source1: https://downloads.isc.org/isc/inn/inn-%{version}.tar.gz.asc
 Source2: inn-default-distributions
 # gpg2 --recv-key 0xD73934B49674CF5CCD9AC2787D80315C5736DE75
 # gpg2 --export --export-options export-minimal 0xD73934B49674CF5CCD9AC2787D80315C5736DE75
@@ -565,6 +565,7 @@ fi
 
 * Thu Feb 18 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-3
 - use a config drop-in instead of modifying rsyslog.conf in a trigger scriptlet
+- switch to HTTPS URLs for sources
 
 * Tue Feb 16 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-2
 - backport upstream patch to fix util/inndf test on ppc64le

diff --git a/inn.spec b/inn.spec
index adb0225..818ea8d 100644
--- a/inn.spec
+++ b/inn.spec
@@ -3,7 +3,7 @@
 Summary: The InterNetNews system, an Usenet news server
 Name: inn
 Version: 2.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
 #see LICENSE file for details
 License: GPLv2+ and BSD and MIT and Public Domain
 URL: https://www.eyrie.org/~eagle/software/inn/
@@ -263,6 +263,9 @@ install -pm644 %{S:30} %{buildroot}%{_sysconfdir}/rsyslog.d/inn.conf
 %check
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} make -C tests test
 
+%global inn_units_with_restart innd.service innd-expire.timer innd-nntpsend.timer innd-rnews.timer
+%global inn_units innd-expire.service innd-nntpsend.service innd-rnews.service
+
 %pre -n inews
 getent group news >/dev/null || groupadd -g 13 -r news
 getent passwd news >/dev/null || \
@@ -289,29 +292,15 @@ exit 0
 su -m news -c '/usr/libexec/news/makedbz -i -o'
 
 umask 002
-touch /var/log/news/news.notice
-touch /var/log/news/news.crit
-touch /var/log/news/news.err
+touch /var/log/news/news.notice /var/log/news/news.crit /var/log/news/news.err
 chown -R news:news /var/log/news*
 
-%systemd_post innd.service
-
-%systemd_post innd-expire.timer
-%systemd_post innd-nntpsend.timer
-%systemd_post innd-rnews.timer
+%systemd_post %{inn_units_with_restart} %{inn_units}
 
 %ldconfig_scriptlets libs
 
 %preun
-%systemd_preun innd.service
-
-%systemd_preun innd-expire.service
-%systemd_preun innd-nntpsend.service
-%systemd_preun innd-rnews.service
-
-%systemd_preun innd-expire.timer
-%systemd_preun innd-nntpsend.timer
-%systemd_preun innd-rnews.timer
+%systemd_preun %{inn_units_with_restart} %{inn_units}
 
 if [ $1 = 0 ]; then
     if [ -f /var/lib/news/history.dir ]; then
@@ -320,11 +309,8 @@ if [ $1 = 0 ]; then
 fi
 
 %postun
-%systemd_postun_with_restart innd.service
-
-%systemd_postun_with_restart innd-expire.timer
-%systemd_postun_with_restart innd-nntpsend.timer
-%systemd_postun_with_restart innd-rnews.timer
+%systemd_postun_with_restart %{inn_units}
+%systemd_postun %{inn_units}
 
 %files
 %license doc/GPL
@@ -573,6 +559,10 @@ fi
 %{_mandir}/man1/inews*
 
 %changelog
+* Tue Mar 02 2021 Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> - 2.6.4-4
+- Rebuilt for updated systemd-rpm-macros
+  See https://pagure.io/fesco/issue/2583.
+
 * Thu Feb 18 2021 Dominik Mierzejewski <rpm@greysector.net> - 2.6.4-3
 - use a config drop-in instead of modifying rsyslog.conf in a trigger scriptlet
 - switch to HTTPS URLs for sources