From 1431513716ac82a4a56057c44db8b57772bb493c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Thu, 24 Aug 2023 19:19:19 +0200 Subject: [PATCH] Setup rpm-ostree-countme.timer according to presets Use systemd macros to enable/disable the rpm-ostree-countme.timer unit following the global systemd presets. This fixes the timer enablement on systems that do no preset-all. See: https://docs.fedoraproject.org/en-US/packaging-guidelines/Scriptlets/#_systemd See: https://src.fedoraproject.org/rpms/fedora-release/pull-request/280 See: https://src.fedoraproject.org/rpms/fedora-release/pull-request/279#comment-159648 --- rpm-ostree.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/rpm-ostree.spec b/rpm-ostree.spec index 28a8494..bdfb0ce 100644 --- a/rpm-ostree.spec +++ b/rpm-ostree.spec @@ -4,7 +4,7 @@ Summary: Hybrid image/package system Name: rpm-ostree Version: 2023.10 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.0-or-later URL: https://github.com/coreos/rpm-ostree # This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot" @@ -233,6 +233,16 @@ $PYTHON autofiles.py > files.devel \ '%{_datadir}/gtk-doc/html/*' \ '%{_datadir}/gir-1.0/*-1.0.gir' +# Setup rpm-ostree-countme.timer according to presets +%post +%systemd_post rpm-ostree-countme.timer + +%preun +%systemd_preun rpm-ostree-countme.timer + +%postun +%systemd_postun_with_restart rpm-ostree-countme.timer + %files -f files %doc COPYING.GPL COPYING.LGPL LICENSE README.md @@ -241,6 +251,9 @@ $PYTHON autofiles.py > files.devel \ %files devel -f files.devel %changelog +* Wed Nov 15 2023 Timothée Ravier - 2023.10-4 +- Setup rpm-ostree-countme.timer according to presets + * Thu Oct 26 2023 Colin Walters - 2023.10-3 - https://github.com/coreos/rpm-ostree/releases/tag/v2023.10