[rpms/fedora-release] f45: 90-default.preset: Enable rpm-ostree count me by default

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : 059e64f73077e1079c2bbefdc79808a11da7d9eb
            Author : Timothée Ravier <tim@siosm.fr>
            Date   : 2021-08-20T15:33:30+02:00
            Stats  : +6/-24 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/059e64f73077e1079c2bbefdc79808a11da7d9eb?branch=f45

            Log:
            90-default.preset: Enable rpm-ostree count me by default

Remove the ostree-counting subpackage and generalize the logic now that
all rpm-ostree variants enable counting by default.

This is only effectively enabled if rpm-ostree is installed by default
and the timer includes a startup contion to make sure the system is
managed by rpm-ostree.

Both of those conditions are true only on rpm-ostree based variants
(IoT, CoreOS, Silverblue/Kinoite).

See: https://bugzilla.redhat.com/show_bug.cgi?id=1995495

---
diff --git a/90-default.preset b/90-default.preset
index d0cb8de..5282aeb 100644
--- a/90-default.preset
+++ b/90-default.preset
@@ -122,6 +122,9 @@ enable qemu-guest-agent.service
 # https://bugzilla.redhat.com/show_bug.cgi?id=928726
 enable dnf-makecache.timer
 
+# https://bugzilla.redhat.com/show_bug.cgi?id=1995495
+enable rpm-ostree-countme.timer
+
 # https://bugzilla.redhat.com/show_bug.cgi?id=957135
 enable vmtoolsd.service
 

diff --git a/fedora-release.spec b/fedora-release.spec
index 7e4b057..8f741ef 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -135,6 +135,9 @@ Provides:       system-release(releasever) = %{releasever}
 # will explicitly conflict with it.
 Conflicts:  generic-release
 
+# rpm-ostree count me is now enabled in 90-default.preset
+Obsoletes: fedora-release-ostree-counting <= 36-0.2
+
 %description common
 Release files common to all Editions and Spins of Fedora
 
@@ -430,7 +433,6 @@ Provides:       system-release
 Provides:       system-release(%{version})
 Provides:       base-module(platform:f%{version})
 Requires:       fedora-release-common = %{version}-%{release}
-Requires:       fedora-release-ostree-counting = %{version}-%{release}
 
 # fedora-release-common Requires: fedora-release-identity, so at least one
 # package must provide it. This Recommends: pulls in
@@ -579,7 +581,6 @@ Provides:       system-release
 Provides:       system-release(%{version})
 Provides:       base-module(platform:f%{version})
 Requires:       fedora-release-common = %{version}-%{release}
-Requires:       fedora-release-ostree-counting = %{version}-%{release}
 Requires:       fedora-release-ostree-desktop = %{version}-%{release}
 
 # Third-party repositories, disabled by default unless the user opts in through fedora-third-party
@@ -624,7 +625,6 @@ Provides:       system-release
 Provides:       system-release(%{version})
 Provides:       base-module(platform:f%{version})
 Requires:       fedora-release-common = %{version}-%{release}
-Requires:       fedora-release-ostree-counting = %{version}-%{release}
 Requires:       fedora-release-ostree-desktop = %{version}-%{release}
 
 # fedora-release-common Requires: fedora-release-identity, so at least one
@@ -652,15 +652,6 @@ itself as Fedora Kinoite.
 %endif
 
 
-%if %{with silverblue} || %{with iot} || %{with kinoite}
-%package ostree-counting
-Summary:        Configuration package for rpm-ostree variants to enable counting
-
-%description ostree-counting
-Configuration package for rpm-ostree variants to enable counting
-%endif
-
-
 %if %{with silverblue} || %{with kinoite}
 %package ostree-desktop
 Summary:        Configuration package for rpm-ostree variants to add rpm-ostree polkit rules
@@ -1129,12 +1120,6 @@ install -Dm0644 %{SOURCE16} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
 install -Dm0644 %{SOURCE17} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
 %endif
 
-%if %{with silverblue} || %{with iot} || %{with kinoite}
-# Pull Count Me timer for rpm-ostreed
-install -dm0755 %{buildroot}%{_unitdir}/rpm-ostreed.service.wants/
-ln -snf %{_unitdir}/rpm-ostree-countme.timer %{buildroot}%{_unitdir}/rpm-ostreed.service.wants/
-%endif
-
 %if %{with xfce}
 # Xfce
 cp -p os-release \
@@ -1343,12 +1328,6 @@ ln -s %{_swidtagdir} %{buildroot}%{_sysconfdir}/swid/swidtags.d/fedoraproject.or
 %endif
 
 
-%if %{with silverblue} || %{with iot} || %{with kinoite}
-%files ostree-counting
-%{_unitdir}/rpm-ostreed.service.wants/rpm-ostree-countme.timer
-%endif
-
-
 %if %{with silverblue} || %{with kinoite}
 %files ostree-desktop
 %attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules