[rpms/inn] epel10: follow current guidelines for systemd units packaging

[rpms/inn] epel10: follow current guidelines for systemd units packaging

[Dominik 'Rathann' Mierzejewski]

            A new commit has been pushed.

            Repo   : rpms/inn
            Branch : epel10
            Commit : be4d4ad39ec0b39c4923aa42e34af3e81776aa51
            Author : Dominik 'Rathann' Mierzejewski <dominik@greysector.net>
            Date   : 2020-09-13T01:39:57+02:00
            Stats  : +10/-24 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/inn/c/be4d4ad39ec0b39c4923aa42e34af3e81776aa51?branch=epel10

            Log:
            follow current guidelines for systemd units packaging

Drop unused file.

---
diff --git a/inn.spec b/inn.spec
index ffb23ff..f8b12a8 100644
--- a/inn.spec
+++ b/inn.spec
@@ -49,7 +49,7 @@ BuildRequires: perl(MIME::Parser)
 BuildRequires: perl(Test::More)
 BuildRequires: perl(Test::Pod)
 BuildRequires: python3-devel
-BuildRequires: systemd
+BuildRequires: systemd-rpm-macros
 BuildRequires: uucp
 BuildRequires: wget
 BuildRequires: zlib-devel
@@ -65,9 +65,6 @@ Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
 Requires: sed
 Requires: wget
 Requires(post): inews
-Requires(post): systemd
-Requires(postun): systemd
-Requires(preun): systemd
 
 # XXX white out bogus perl requirement for now
 Provides: perl(::usr/lib/innshellvars.pl) = %{version}-%{release}
@@ -267,6 +264,13 @@ D %{_localstatedir}/run/news 0755 news news -
 EOF
 install -d -m 0755 $RPM_BUILD_ROOT%{_localstatedir}/run/news
 
+install -d %{buildroot}%{_presetdir}
+cat <<EOF >%{buildroot}%{_presetdir}/80-inn.preset
+enable innd-expire.timer
+enable innd-nntpsend.timer
+enable innd-rnews.timer
+EOF
+
 %check
 LD_LIBRARY_PATH=%{buildroot}%{_libdir} %make_build check
 
@@ -307,10 +311,6 @@ chown -R news:news /var/log/news*
 %systemd_post innd-nntpsend.timer
 %systemd_post innd-rnews.timer
 
-systemctl start innd-expire.timer
-systemctl start innd-nntpsend.timer
-systemctl start innd-rnews.timer
-
 %ldconfig_scriptlets libs
 
 %triggerin -- rsyslog
@@ -394,6 +394,7 @@ fi
 %{_unitdir}/innd-nntpsend.timer
 %{_unitdir}/innd-rnews.service
 %{_unitdir}/innd-rnews.timer
+%{_presetdir}/80-inn.preset
 %defattr(-,news,news,-)
 # tmpfile.d files
 %{_tmpfilesdir}/inn.conf
@@ -628,6 +629,7 @@ fi
 - add missing build dependencies (enable zlib and gdbm)
 - minimize shared library deps as recommended by upstream
 - add missing test dependencies and run testsuite
+- follow current guidelines for systemd units packaging
 
 * Wed Sep 09 2020 Petr Viktorin <pviktori@redhat.com> - 2.6.3-9
 - Switch BuildRequires to python3

diff --git a/innd-hourly.timer b/innd-hourly.timer
deleted file mode 100644
index a552988..0000000
--- a/innd-hourly.timer
+++ /dev/null
@@ -1,16 +0,0 @@
-[Unit]
-Description=InterNet News Daemon
-After=syslog.target network.target
-ConditionPathExists=/etc/news/inn.conf
-
-[Service]
-User=news
-PermissionsStartOnly=true
-PIDFile=/run/news/innd.pid
-Type=forking
-ExecStart=/usr/libexec/news/rc.news
-ExecStop=/bin/su -m  news -c '/usr/libexec/news/rc.news stop'
-KillMode=control-group
-
-[Install]
-WantedBy=multi-user.target
\ No newline at end of file