| |
@@ -135,6 +135,9 @@
|
| |
# 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(%{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(%{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(%{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 @@
|
| |
%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 %{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 @@
|
| |
%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
|
| |
siosm
commented 2 years ago
Remove the ostree-counting subpackage and generalize the logic now that
all rpm-ostree variants enables counting by default.
This is only effectively enabled if rpm-ostree is installed 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