public inbox for git-commits@fedoraproject.org
help / color / mirror / Atom feed
From: Yaakov Selkowitz <yselkowi@redhat.com>
To: git-commits@fedoraproject.org
Subject: [rpms/fedora-release] f45: Drop all conditionals
Date: Mon, 10 Aug 2026 09:37:03 GMT [thread overview]
Message-ID: <178635462355.1.9133647014191289374.rpms-fedora-release-53e08d5b85b0@fedoraproject.org> (raw)
A new commit has been pushed.
Repo : rpms/fedora-release
Branch : f45
Commit : 53e08d5b85b0ee1ec1218d062db496788ae7774c
Author : Yaakov Selkowitz <yselkowi@redhat.com>
Date : 2026-05-01T12:31:57-04:00
Stats : +29/-258 in 1 file(s)
URL : https://src.fedoraproject.org/rpms/fedora-release/c/53e08d5b85b0ee1ec1218d062db496788ae7774c?branch=f45
Log:
Drop all conditionals
The only practical purpose of the conditionals was to build differently for
rawhide vs ELN. With the latter split out into a separate
fedora-eln-release package, this can be further simplified by dropping all
the conditionals.
Also, apply consistent line spacing between sections.
---
diff --git a/fedora-release.spec b/fedora-release.spec
index 97a91db..d29ee0b 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -20,45 +20,6 @@
%define doc_version f%{dist_version}
%endif
-%bcond basic %[%{undefined eln}]
-%bcond cinnamon %[%{undefined eln}]
-%bcond cloud %[%{undefined eln}]
-%bcond compneuro %[%{undefined eln}]
-%bcond container %[%{undefined eln}]
-%bcond coreos %[%{undefined eln}]
-%bcond designsuite %[%{undefined eln}]
-%bcond flatpak %[%{undefined eln}]
-%bcond iot %[%{undefined eln}]
-%bcond kde_desktop %[%{undefined eln}]
-%bcond kde_mobile %[%{undefined eln}]
-%bcond matecompiz %[%{undefined eln}]
-%bcond server %[%{undefined eln}]
-%bcond silverblue %[%{undefined eln}]
-%bcond kinoite %[%{undefined eln}]
-%bcond kinoite_mobile %[%{undefined eln}]
-%bcond snappy %[%{undefined eln}]
-%bcond soas %[%{undefined eln}]
-%bcond toolbx %[%{undefined eln}]
-%bcond workstation %[%{undefined eln}]
-%bcond xfce %[%{undefined eln}]
-%bcond i3 %[%{undefined eln}]
-%bcond lxde %[%{undefined eln}]
-%bcond lxqt %[%{undefined eln}]
-%bcond budgie %[%{undefined eln}]
-%bcond budgie_atomic %[%{undefined eln}]
-%bcond sway %[%{undefined eln}]
-%bcond sway_atomic %[%{undefined eln}]
-%bcond mobility %[%{undefined eln}]
-%bcond miraclewm %[%{undefined eln}]
-%bcond miraclewm_atomic %[%{undefined eln}]
-%bcond cosmic %[%{undefined eln}]
-%bcond cosmic_atomic %[%{undefined eln}]
-%bcond wsl %[%{undefined eln}]
-
-%if %{with silverblue} || %{with kinoite} || %{with kinoite_mobile} || %{with sway_atomic} || %{with budgie_atomic} || %{with miraclewm_atomic} || %{with cosmic_atomic}
-%global with_ostree_desktop 1
-%endif
-
%global dist %{nil}
# Changes should be submitted as pull requests under
@@ -157,7 +118,6 @@ Obsoletes: fedora-release-common < 45-0.3
Release files common to all Editions and Spins of Fedora
-%if %{with basic}
%package identity-basic
Summary: Package providing the basic Fedora identity
@@ -169,10 +129,8 @@ Conflicts: fedora-release-identity
%description identity-basic
Provides the necessary files for a Fedora installation that is not identifying
itself as a particular Edition or Spin.
-%endif
-%if %{with cinnamon}
%package cinnamon
Summary: Base package for Fedora Cinnamon-specific default configurations
@@ -211,10 +169,8 @@ Conflicts: fedora-release-identity-cinnamon < 45-0.3
%description identity-cinnamon
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Cinnamon.
-%endif
-%if %{with cloud}
%package cloud
Summary: Base package for Fedora Cloud-specific default configurations
@@ -248,10 +204,8 @@ Requires(meta): fedora-release-cloud = %{version}-%{release}
%description identity-cloud
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Cloud Edition.
-%endif
-%if %{with compneuro}
%package compneuro
Summary: Base package for Fedora Comp Neuro specific default configurations
@@ -290,10 +244,8 @@ Conflicts: fedora-release-identity-compneuro < 45-0.3
%description identity-compneuro
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Comp Neuro Lab.
-%endif
-%if %{with container}
%package container
Summary: Base package for Fedora container specific default configurations
@@ -327,10 +279,8 @@ Requires(meta): fedora-release-container = %{version}-%{release}
%description identity-container
Provides the necessary files for a Fedora installation that is identifying
itself as the Fedora Container Base Image.
-%endif
-%if %{with coreos}
%package coreos
Summary: Base package for Fedora CoreOS-specific default configurations
@@ -364,10 +314,8 @@ Requires(meta): fedora-release-coreos = %{version}-%{release}
%description identity-coreos
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora CoreOS.
-%endif
-%if %{with designsuite}
%package designsuite
Summary: Base package for Fedora Design Suite specific default configurations
@@ -407,10 +355,8 @@ Conflicts: fedora-release-identity-designsuite < 45-0.3
%description identity-designsuite
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Design Suite Lab.
-%endif
-%if %{with flatpak}
%package flatpak
Summary: Base package for Fedora flatpak specific default configurations
@@ -451,10 +397,8 @@ Suggests: wget2-wget
%description identity-flatpak
Provides the necessary files for a Fedora installation that is identifying
itself as the Fedora Flatpak Runtime Image.
-%endif
-%if %{with iot}
%package iot
Summary: Base package for Fedora IoT specific default configurations
@@ -489,10 +433,8 @@ Requires(meta): fedora-release-iot = %{version}-%{release}
%description identity-iot
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora IoT Edition.
-%endif
-%if %{with kde_desktop}
%package kde-desktop
Summary: Base package for Fedora KDE Plasma Desktop-specific default configurations
@@ -535,9 +477,8 @@ Conflicts: fedora-release-identity-kde-desktop < 45-0.3
%description identity-kde-desktop
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora KDE Plasma Desktop Edition.
-%endif
-%if %{with kde_mobile}
+
%package kde-mobile
Summary: Base package for Fedora KDE Plasma Mobile specific default configurations
@@ -576,9 +517,8 @@ Conflicts: fedora-release-identity-kde-mobile < 45-0.3
%description identity-kde-mobile
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora KDE Plasma Mobile Spin.
-%endif
-%if %{with matecompiz}
+
%package matecompiz
Summary: Base package for Fedora MATE-Compiz-specific default configurations
@@ -617,10 +557,8 @@ Conflicts: fedora-release-identity-matecompiz < 45-0.3
%description identity-matecompiz
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora MATE-Compiz.
-%endif
-%if %{with server}
%package server
Summary: Base package for Fedora Server-specific default configurations
@@ -654,10 +592,8 @@ Requires(meta): fedora-release-server = %{version}-%{release}
%description identity-server
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Server Edition.
-%endif
-%if %{with silverblue}
%package silverblue
Summary: Base package for Fedora Silverblue-specific default configurations
@@ -697,10 +633,8 @@ Conflicts: fedora-release-identity-silverblue < 45-0.3
%description identity-silverblue
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Silverblue.
-%endif
-%if %{with kinoite}
%package kinoite
Summary: Base package for Fedora Kinoite-specific default configurations
@@ -740,9 +674,8 @@ Conflicts: fedora-release-identity-kinoite < 45-0.3
%description identity-kinoite
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Kinoite.
-%endif
-%if %{with kinoite_mobile}
+
%package kinoite-mobile
Summary: Base package for Fedora Kinoite Mobile specific default configurations
@@ -782,9 +715,8 @@ Conflicts: fedora-release-identity-kinoite-mobile < 45-0.3
%description identity-kinoite-mobile
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Kinoite Mobile.
-%endif
-%if %{with ostree_desktop}
+
%package ostree-desktop
Summary: Configuration package for rpm-ostree variants to add rpm-ostree polkit rules
@@ -798,10 +730,8 @@ Conflicts: fedora-release-ostree-desktop < 45-0.3
%description ostree-desktop
Configuration package for rpm-ostree variants to add rpm-ostree polkit rules
-%endif
-%if %{with snappy}
%package snappy
Summary: Base package for Fedora snap specific default configurations
@@ -835,10 +765,8 @@ Requires(meta): fedora-release-snappy = %{version}-%{release}
%description identity-snappy
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora's snappy environment.
-%endif
-%if %{with soas}
%package soas
Summary: Base package for Fedora Sugar on a Stick-specific default configurations
@@ -877,10 +805,8 @@ Conflicts: fedora-release-identity-soas < 45-0.3
%description identity-soas
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Sugar on a Stick.
-%endif
-%if %{with toolbx}
%package toolbx
Summary: Base package for Fedora Toolbx container specific default configurations
@@ -914,9 +840,8 @@ Requires(meta): fedora-release-toolbx = %{version}-%{release}
%description identity-toolbx
Provides the necessary files for a Fedora installation that is identifying
itself as the Fedora Toolbx container image.
-%endif
-%if %{with workstation}
+
%package workstation
Summary: Base package for Fedora Workstation-specific default configurations
@@ -956,10 +881,8 @@ Conflicts: fedora-release-identity-workstation < 45-0.3
%description identity-workstation
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Workstation Edition.
-%endif
-%if %{with xfce}
%package xfce
Summary: Base package for Fedora Xfce specific default configurations
@@ -998,10 +921,8 @@ Conflicts: fedora-release-identity-xfce < 45-0.3
%description identity-xfce
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Xfce.
-%endif
-%if %{with i3}
%package i3
Summary: Base package for Fedora i3 specific default configurations
@@ -1040,10 +961,8 @@ Conflicts: fedora-release-identity-i3 < 45-0.3
%description identity-i3
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora i3.
-%endif
-%if %{with lxde}
%package lxde
Summary: Base package for Fedora LXDE specific default configurations
@@ -1082,10 +1001,8 @@ Conflicts: fedora-release-identity-lxde < 45-0.3
%description identity-lxde
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora LXDE.
-%endif
-%if %{with lxqt}
%package lxqt
Summary: Base package for Fedora LXQt specific default configurations
@@ -1124,9 +1041,8 @@ Conflicts: fedora-release-identity-lxqt < 45-0.3
%description identity-lxqt
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora LXQt.
-%endif
-%if %{with budgie}
+
%package budgie
Summary: Base package for Fedora Budgie specific default configurations
@@ -1165,10 +1081,8 @@ Conflicts: fedora-release-identity-budgie < 45-0.3
%description identity-budgie
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Budgie.
-%endif
-%if %{with sway}
%package sway
Summary: Base package for Fedora Sway specific default configurations
@@ -1207,10 +1121,8 @@ Conflicts: fedora-release-identity-sway < 45-0.3
%description identity-sway
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Sway.
-%endif
-%if %{with sway_atomic}
%package sway-atomic
Summary: Base package for Fedora Sway Atomic specific default configurations
@@ -1250,9 +1162,8 @@ Conflicts: fedora-release-identity-sway-atomic < 45-0.3
%description identity-sway-atomic
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Sway Atomic.
-%endif
-%if %{with budgie_atomic}
+
%package budgie-atomic
Summary: Base package for Fedora Budgie Atomic specific default configurations
@@ -1292,10 +1203,8 @@ Conflicts: fedora-release-identity-budgie-atomic < 45-0.3
%description identity-budgie-atomic
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Budgie Atomic.
-%endif
-%if %{with mobility}
%package mobility
Summary: Base package for Fedora Mobility specific default configurations
@@ -1334,9 +1243,8 @@ Conflicts: fedora-release-identity-mobility < 45-0.3
%description identity-mobility
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Mobility.
-%endif
-%if %{with miraclewm}
+
%package miraclewm
Summary: Base package for Fedora MiracleWM specific default configurations
@@ -1375,10 +1283,8 @@ Conflicts: fedora-release-identity-miraclewm < 45-0.3
%description identity-miraclewm
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Miracle Window Manager.
-%endif
-%if %{with miraclewm_atomic}
%package miraclewm-atomic
Summary: Base package for Fedora MiracleWM Atomic specific default configurations
@@ -1418,10 +1324,8 @@ Conflicts: fedora-release-identity-miraclewm-atomic < 45-0.3
%description identity-miraclewm-atomic
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora Miracle Window Manager Atomic.
-%endif
-%if %{with cosmic}
%package cosmic
Summary: Base package for Fedora COSMIC specific default configurations
@@ -1460,10 +1364,8 @@ Conflicts: fedora-release-identity-cosmic < 45-0.3
%description identity-cosmic
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora COSMIC.
-%endif
-%if %{with cosmic_atomic}
%package cosmic-atomic
Summary: Base package for Fedora COSMIC Atomic specific default configurations
@@ -1503,9 +1405,8 @@ Conflicts: fedora-release-identity-cosmic-atomic < 45-0.3
%description identity-cosmic-atomic
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora COSMIC Atomic.
-%endif
-%if %{with wsl}
+
%package wsl
Summary: Base package for Fedora WSL specific default configurations
@@ -1539,7 +1440,7 @@ Requires(meta): fedora-release-container = %{version}-%{release}
%description identity-wsl
Provides the necessary files for a Fedora installation that is identifying
itself as Fedora WSL.
-%endif
+
%prep
mkdir -p licenses
@@ -1642,13 +1543,10 @@ mkdir -p %{buildroot}%{_swidtagdir}
# Create os-release files for the different editions
-%if %{with basic}
# Basic
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.basic
-%endif
-%if %{with cinnamon}
# Cinnamon
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.cinnamon
@@ -1656,9 +1554,7 @@ echo "VARIANT=\"Cinnamon\"" >> %{buildroot}%{_prefix}/lib/os-release.cinnamon
echo "VARIANT_ID=cinnamon" >> %{buildroot}%{_prefix}/lib/os-release.cinnamon
sed -i -e "s|(%{release_name}%{?prerelease})|(Cinnamon%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.cinnamon
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Cinnamon/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cinnamon
-%endif
-%if %{with cloud}
# Cloud
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.cloud
@@ -1667,9 +1563,7 @@ echo "VARIANT_ID=cloud" >> %{buildroot}%{_prefix}/lib/os-release.cloud
sed -i -e "s|(%{release_name}%{?prerelease})|(Cloud Edition%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.cloud
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Cloud/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cloud
sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.cloud
-%endif
-%if %{with compneuro}
# Comp Neuro
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.compneuro
@@ -1679,9 +1573,7 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(CompNeuro%{?prerelease})|g" %{buil
sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://neuro.fedoraproject.org"|' %{buildroot}%{_prefix}/lib/os-release.compneuro
sed -i -e 's|HOME_URL=.*|HOME_URL="https://labs.fedoraproject.org"|' %{buildroot}/%{_prefix}/lib/os-release.compneuro
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/CompNeuro/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.compneuro
-%endif
-%if %{with container}
# Container
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.container
@@ -1689,9 +1581,7 @@ echo "VARIANT=\"Container Image\"" >> %{buildroot}%{_prefix}/lib/os-release.cont
echo "VARIANT_ID=container" >> %{buildroot}%{_prefix}/lib/os-release.container
sed -i -e "s|(%{release_name}%{?prerelease})|(Container Image%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.container
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Container/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.container
-%endif
-%if %{with coreos}
# CoreOS
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.coreos
@@ -1708,10 +1598,7 @@ sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.coreos
install -Dm0644 %{SOURCE22} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
-%endif
-
-%if %{with designsuite}
# Design Suite
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.designsuite
@@ -1721,9 +1608,7 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(Design Suite%{?prerelease})|g" %{b
sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://fedoraproject.org/wiki/Design_Suite"|' %{buildroot}%{_prefix}/lib/os-release.designsuite
sed -i -e 's|HOME_URL=.*|HOME_URL="https://labs.fedoraproject.org"|' %{buildroot}/%{_prefix}/lib/os-release.designsuite
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/DesignSuite/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.designsuite
-%endif
-%if %{with flatpak}
# Flatpak
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.flatpak
@@ -1735,9 +1620,7 @@ sed -i -e 's|SUPPORT_URL=.*|SUPPORT_URL="https://gitlab.com/fedora/sigs/flatpak/
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/flatpak/fedora-flatpaks/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.flatpak
sed -i -e 's|PRETTY_NAME=.*|PRETTY_NAME="Fedora %{dist_version} (Flatpak runtime)"|' %{buildroot}/%{_prefix}/lib/os-release.flatpak
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Flatpak/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.flatpak
-%endif
-%if %{with iot}
# IoT
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.iot
@@ -1749,9 +1632,7 @@ sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.iot
install -p %{SOURCE23} %{buildroot}/%{_prefix}/lib/
install -Dm0644 %{SOURCE18} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE24} -t %{buildroot}%{_prefix}/lib/systemd/user-preset/
-%endif
-%if %{with kde_desktop}
# KDE Plasma Desktop
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.kde-desktop
@@ -1762,9 +1643,7 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(KDE Plasma Desktop Edition%{?prere
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/KDE Desktop/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde-desktop
# Add plasma-desktop to dnf protected packages list for KDE Desktop
install -Dm0644 %{SOURCE25} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
-%endif
-%if %{with kde_mobile}
# KDE Plasma Mobile
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.kde-mobile
@@ -1774,9 +1653,7 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(KDE Plasma Mobile%{?prerelease})|g
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/KDE Mobile/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde-mobile
# Add plasma-mobile to dnf protected packages list for KDE Mobile
install -Dm0644 %{SOURCE33} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
-%endif
-%if %{with matecompiz}
# MATE-Compiz
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.matecompiz
@@ -1784,9 +1661,7 @@ echo "VARIANT=\"MATE-Compiz\"" >> %{buildroot}%{_prefix}/lib/os-release.matecomp
echo "VARIANT_ID=matecompiz" >> %{buildroot}%{_prefix}/lib/os-release.matecompiz
sed -i -e "s|(%{release_name}%{?prerelease})|(MATE-Compiz%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.matecompiz
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/MATE-Compiz/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.matecompiz
-%endif
-%if %{with server}
# Server
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.server
@@ -1799,9 +1674,7 @@ install -Dm0644 %{SOURCE14} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
install -Dm0644 %{SOURCE29} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/system.conf.d/
install -Dm0644 %{SOURCE28} -t %{buildroot}%{_prefix}/lib/systemd/user.conf.d/
-%endif
-%if %{with silverblue}
# Silverblue
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.silverblue
@@ -1812,9 +1685,7 @@ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.
sed -i -e 's|HOME_URL=.*|HOME_URL="https://silverblue.fedoraproject.org"|' %{buildroot}/%{_prefix}/lib/os-release.silverblue
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://github.com/fedora-silverblue/issue-tracker/issues"|' %{buildroot}/%{_prefix}/lib/os-release.silverblue
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Silverblue/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.silverblue
-%endif
-%if %{with kinoite}
# Kinoite
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.kinoite
@@ -1825,9 +1696,7 @@ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.
sed -i -e 's|HOME_URL=.*|HOME_URL="https://kinoite.fedoraproject.org"|' %{buildroot}/%{_prefix}/lib/os-release.kinoite
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-kde/SIG/issues"|' %{buildroot}/%{_prefix}/lib/os-release.kinoite
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Kinoite/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kinoite
-%endif
-%if %{with kinoite_mobile}
# Kinoite Mobile
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.kinoite-mobile
@@ -1838,9 +1707,7 @@ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.
sed -i -e 's|HOME_URL=.*|HOME_URL="https://kinoite.fedoraproject.org"|' %{buildroot}/%{_prefix}/lib/os-release.kinoite-mobile
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-kde/SIG/issues"|' %{buildroot}/%{_prefix}/lib/os-release.kinoite-mobile
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Kinoite Mobile/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kinoite-mobile
-%endif
-%if %{with snappy}
# Snappy
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.snappy
@@ -1848,9 +1715,7 @@ echo "VARIANT=\"Snappy\"" >> %{buildroot}%{_prefix}/lib/os-release.snappy
echo "VARIANT_ID=snappy" >> %{buildroot}%{_prefix}/lib/os-release.snappy
sed -i -e "s|(%{release_name}%{?prerelease})|(Snappy%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.snappy
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Snappy/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.snappy
-%endif
-%if %{with soas}
# Sugar on a Stick
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.soas
@@ -1858,9 +1723,7 @@ echo "VARIANT=\"Sugar on a Stick\"" >> %{buildroot}%{_prefix}/lib/os-release.soa
echo "VARIANT_ID=soas" >> %{buildroot}%{_prefix}/lib/os-release.soas
sed -i -e "s|(%{release_name}%{?prerelease})|(Sugar on a Stick%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.soas
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Sugar/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.soas
-%endif
-%if %{with toolbx}
# Toolbx
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.toolbx
@@ -1868,9 +1731,7 @@ echo "VARIANT=\"Toolbx Container Image\"" >> %{buildroot}%{_prefix}/lib/os-relea
echo "VARIANT_ID=toolbx" >> %{buildroot}%{_prefix}/lib/os-release.toolbx
sed -i -e "s|(%{release_name}%{?prerelease})|(Toolbx Container Image%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.toolbx
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Toolbx/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.toolbx
-%endif
-%if %{with workstation}
# Workstation
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.workstation
@@ -1880,31 +1741,21 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(Workstation Edition%{?prerelease})
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Workstation/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.workstation
# Add Fedora Workstation dnf protected packages list
install -Dm0644 %{SOURCE21} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
-%endif
-%if %{with silverblue} || %{with workstation}
# Silverblue and Workstation
install -Dm0644 %{SOURCE15} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
# Override the list of enabled gnome-shell extensions for Workstation
install -Dm0644 %{SOURCE16} -t %{buildroot}%{_datadir}/glib-2.0/schemas/
-%endif
-%if %{with kde_desktop} || %{with kinoite}
-# Spin specific preset
+# KDE Desktop specific preset
install -Dm0644 %{SOURCE26} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
-%endif
-%if %{with kde_mobile} || %{with kinoite_mobile}
-# Spin specific preset
+# KDE Mobile specific preset
install -Dm0644 %{SOURCE34} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
-%endif
-%if %{with ostree_desktop}
# Install rpm-ostree polkit rules
install -Dm0644 %{SOURCE17} -t %{buildroot}%{_datadir}/polkit-1/rules.d/
-%endif
-%if %{with xfce}
# Xfce
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.xfce
@@ -1912,17 +1763,14 @@ echo "VARIANT=\"Xfce\"" >> %{buildroot}%{_prefix}/lib/os-release.xfce
echo "VARIANT_ID=xfce" >> %{buildroot}%{_prefix}/lib/os-release.xfce
sed -i -e "s|(%{release_name}%{?prerelease})|(Xfce%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.xfce
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Xfce/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.xfce
-%endif
-%if %{with i3}
+# i3
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.i3
echo "VARIANT=\"i3\"" >> %{buildroot}%{_prefix}/lib/os-release.i3
echo "VARIANT_ID=i3" >> %{buildroot}%{_prefix}/lib/os-release.i3
sed -i -e "s|(%{release_name}%{?prerelease})|(i3%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.i3
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/i3/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.i3
-%endif
-%if %{with lxde}
# LXDE
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.lxde
@@ -1930,9 +1778,7 @@ echo "VARIANT=\"LXDE\"" >> %{buildroot}%{_prefix}/lib/os-release.lxde
echo "VARIANT_ID=lxde" >> %{buildroot}%{_prefix}/lib/os-release.lxde
sed -i -e "s|(%{release_name}%{?prerelease})|(LXDE%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.lxde
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/LXDE/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.lxde
-%endif
-%if %{with lxqt}
# LXQt
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.lxqt
@@ -1940,9 +1786,7 @@ echo "VARIANT=\"LXQt\"" >> %{buildroot}%{_prefix}/lib/os-release.lxqt
echo "VARIANT_ID=lxqt" >> %{buildroot}%{_prefix}/lib/os-release.lxqt
sed -i -e "s|(%{release_name}%{?prerelease})|(LXQt%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.lxqt
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/LXQt/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.lxqt
-%endif
-%if %{with budgie}
# Budgie
cp -p os-release \
%{buildroot}%{_prefix}/lib/os-release.budgie
@@ -1950,9 +1794,8 @@ echo "VARIANT=\"Budgie\"" >> %{buildroot}%{_prefix}/lib/os-release.budgie
echo "VARIANT_ID=budgie" >> %{buildroot}%{_prefix}/lib/os-release.budgie
sed -i -e "s|(%{release_name}%{?prerelease})|(Budgie%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.budgie
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Budgie/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.budgie
-%endif
-%if %{with sway}
+# Sway
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.sway
echo "VARIANT=\"Sway\"" >> %{buildroot}%{_prefix}/lib/os-release.sway
echo "VARIANT_ID=sway" >> %{buildroot}%{_prefix}/lib/os-release.sway
@@ -1961,9 +1804,8 @@ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sw
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Sway/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sway
# Add Fedora Sway dnf protected packages list
install -Dm0644 %{SOURCE30} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
-%endif
-%if %{with sway_atomic}
+# Sway Atomic
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.sway-atomic
echo "VARIANT=\"Sway Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.sway-atomic
echo "VARIANT_ID=sway-atomic" >> %{buildroot}%{_prefix}/lib/os-release.sway-atomic
@@ -1972,9 +1814,8 @@ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.
sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/sway/"|' %{buildroot}/%{_prefix}/lib/os-release.sway-atomic
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://gitlab.com/fedora/sigs/sway/SIG/-/issues"|' %{buildroot}/%{_prefix}/lib/os-release.sway-atomic
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/SwayAtomic/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sway-atomic
-%endif
-%if %{with budgie_atomic}
+# Budgie Atomic
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.budgie-atomic
echo "VARIANT=\"Budgie Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.budgie-atomic
echo "VARIANT_ID=budgie-atomic" >> %{buildroot}%{_prefix}/lib/os-release.budgie-atomic
@@ -1983,17 +1824,15 @@ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.
sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/budgie/"|' %{buildroot}/%{_prefix}/lib/os-release.budgie-atomic
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-budgie/project/issues"|' %{buildroot}/%{_prefix}/lib/os-release.budgie-atomic
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/BudgieAtomic/;s/<!--.*-->//;/^$/d' %{SOURCE19} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.budgie-atomic
-%endif
-%if %{with mobility}
+# Mobility
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.mobility
echo "VARIANT=\"Mobility\"" >> %{buildroot}%{_prefix}/lib/os-release.mobility
echo "VARIANT_ID=mobility" >> %{buildroot}%{_prefix}/lib/os-release.mobility
sed -i -e "s|(%{release_name}%{?prerelease})|(Mobility%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.mobility
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/Mobility/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.mobility
-%endif
-%if %{with miraclewm}
+# MiracleWM
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.miraclewm
echo "VARIANT=\"MiracleWM\"" >> %{buildroot}%{_prefix}/lib/os-release.miraclewm
echo "VARIANT_ID=miraclewm" >> %{buildroot}%{_prefix}/lib/os-release.miraclewm
@@ -2002,9 +1841,8 @@ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-miracle/
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/MiracleWM/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.miraclewm
# Add Fedora MiracleWM dnf protected packages list
install -Dm0644 %{SOURCE35} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
-%endif
-%if %{with miraclewm_atomic}
+# MiracleWM Atomic
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.miraclewm-atomic
echo "VARIANT=\"MiracleWM Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.miraclewm-atomic
echo "VARIANT_ID=miraclewm-atomic" >> %{buildroot}%{_prefix}/lib/os-release.miraclewm-atomic
@@ -2013,9 +1851,8 @@ sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.
sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/miraclewm/"|' %{buildroot}/%{_prefix}/lib/os-release.miraclewm-atomic
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-miracle/SIG/issues"|' %{buildroot}/%{_prefix}/lib/os-release.miraclewm-atomic
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/MiracleWMAtomic/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.miraclewm-atomic
-%endif
-%if %{with cosmic}
+# COSMIC
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.cosmic
echo "VARIANT=\"COSMIC\"" >> %{buildroot}%{_prefix}/lib/os-release.cosmic
echo "VARIANT_ID=cosmic" >> %{buildroot}%{_prefix}/lib/os-release.cosmic
@@ -2024,9 +1861,8 @@ sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-cosmic/S
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/COSMIC/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic
# Add Fedora COSMIC dnf protected packages list
install -Dm0644 %{SOURCE36} -t %{buildroot}%{_sysconfdir}/dnf/protected.d/
-%endif
-%if %{with cosmic_atomic}
+# COSMIC Atomic
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
echo "VARIANT=\"COSMIC Atomic\"" >> %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
echo "VARIANT_ID=cosmic-atomic" >> %{buildroot}%{_prefix}/lib/os-release.cosmic-atomic
@@ -2034,15 +1870,13 @@ sed -i -e "s|(%{release_name}%{?prerelease})|(COSMIC Atomic%{?prerelease})|g" %{
sed -i -e 's|HOME_URL=.*|HOME_URL="https://fedoraproject.org/atomic-desktops/cosmic/"|' %{buildroot}/%{_prefix}/lib/os-release.cosmic-atomic
sed -i -e 's|BUG_REPORT_URL=.*|BUG_REPORT_URL="https://pagure.io/fedora-cosmic/SIG/issues"|' %{buildroot}/%{_prefix}/lib/os-release.cosmic-atomic
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/COSMICAtomic/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic-atomic
-%endif
-%if %{with wsl}
+# WSL
cp -p os-release %{buildroot}%{_prefix}/lib/os-release.wsl
echo "VARIANT=\"WSL\"" >> %{buildroot}%{_prefix}/lib/os-release.wsl
echo "VARIANT_ID=wsl" >> %{buildroot}%{_prefix}/lib/os-release.wsl
sed -i -e "s|(%{release_name}%{?prerelease})|(WSL%{?prerelease})|g" %{buildroot}%{_prefix}/lib/os-release.wsl
sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/WSL/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.wsl
-%endif
# Create the symlink for /etc/os-release
ln -s ../usr/lib/os-release %{buildroot}%{_sysconfdir}/os-release
@@ -2100,46 +1934,35 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
%{_prefix}/share/dnf5/libdnf.conf.d/20-fedora-defaults.conf
-%if %{with basic}
%files
%files identity-basic
%{_prefix}/lib/os-release.basic
-%endif
-%if %{with cinnamon}
%files cinnamon
%files identity-cinnamon
%{_prefix}/lib/os-release.cinnamon
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cinnamon
-%endif
-%if %{with cloud}
%files cloud
%files identity-cloud
%{_prefix}/lib/os-release.cloud
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cloud
-%endif
-%if %{with compneuro}
%files compneuro
%files identity-compneuro
%{_prefix}/lib/os-release.compneuro
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.compneuro
-%endif
-%if %{with container}
%files container
%files identity-container
%{_prefix}/lib/os-release.container
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.container
-%endif
-%if %{with coreos}
%files coreos
%files identity-coreos
%{_prefix}/lib/systemd/system-preset/80-coreos.preset
@@ -2147,26 +1970,20 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
%{_prefix}/lib/systemd/user.conf.d/longer-default-shutdown-timeout.conf
%{_prefix}/lib/os-release.coreos
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.coreos
-%endif
-%if %{with designsuite}
%files designsuite
%files identity-designsuite
%{_prefix}/lib/os-release.designsuite
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.designsuite
-%endif
-%if %{with flatpak}
%files flatpak
%files identity-flatpak
%{_prefix}/lib/os-release.flatpak
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.flatpak
-%endif
-%if %{with iot}
%files iot
%files identity-iot
%{_prefix}/lib/os-release.iot
@@ -2174,36 +1991,30 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
%{_prefix}/lib/systemd/user-preset/80-iot-user.preset
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.iot
%{_prefix}/lib/zezere-ignition-url
-%endif
-%if %{with kde_desktop}
%files kde-desktop
%files identity-kde-desktop
%{_prefix}/lib/os-release.kde-desktop
%{_prefix}/lib/systemd/system-preset/80-kde-desktop.preset
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde-desktop
%{_sysconfdir}/dnf/protected.d/plasma-desktop.conf
-%endif
-%if %{with kde_mobile}
+
%files kde-mobile
%files identity-kde-mobile
%{_prefix}/lib/os-release.kde-mobile
%{_prefix}/lib/systemd/system-preset/80-kde-mobile.preset
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kde-mobile
%{_sysconfdir}/dnf/protected.d/plasma-mobile.conf
-%endif
-%if %{with matecompiz}
+
%files matecompiz
%files identity-matecompiz
%{_prefix}/lib/os-release.matecompiz
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.matecompiz
-%endif
-%if %{with server}
%files server
%files identity-server
%{_prefix}/lib/os-release.server
@@ -2212,10 +2023,8 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
%{_prefix}/lib/systemd/user.conf.d/longer-default-shutdown-timeout.conf
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.server
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.override
-%endif
-%if %{with silverblue}
%files silverblue
%files identity-silverblue
%{_prefix}/lib/os-release.silverblue
@@ -2223,56 +2032,44 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
# Keep this in sync with workstation below
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override
%{_prefix}/lib/systemd/system-preset/80-workstation.preset
-%endif
-%if %{with kinoite}
%files kinoite
%files identity-kinoite
%{_prefix}/lib/os-release.kinoite
%{_prefix}/lib/systemd/system-preset/80-kde-desktop.preset
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kinoite
-%endif
-%if %{with kinoite_mobile}
+
%files kinoite-mobile
%files identity-kinoite-mobile
%{_prefix}/lib/os-release.kinoite-mobile
%{_prefix}/lib/systemd/system-preset/80-kde-mobile.preset
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.kinoite-mobile
-%endif
-%if %{with ostree_desktop}
+
%files ostree-desktop
%attr(0644,root,root) %{_prefix}/share/polkit-1/rules.d/org.projectatomic.rpmostree1.rules
-%endif
-%if %{with snappy}
%files snappy
%files identity-snappy
%{_prefix}/lib/os-release.snappy
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.snappy
-%endif
-%if %{with soas}
%files soas
%files identity-soas
%{_prefix}/lib/os-release.soas
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.soas
-%endif
-%if %{with toolbx}
%files toolbx
%files identity-toolbx
%{_prefix}/lib/os-release.toolbx
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.toolbx
-%endif
-%if %{with workstation}
%files workstation
%files identity-workstation
%{_prefix}/lib/os-release.workstation
@@ -2281,119 +2078,93 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
# Keep this in sync with silverblue above
%{_datadir}/glib-2.0/schemas/org.gnome.shell.gschema.override
%{_prefix}/lib/systemd/system-preset/80-workstation.preset
-%endif
-%if %{with xfce}
%files xfce
%files identity-xfce
%{_prefix}/lib/os-release.xfce
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.xfce
-%endif
-%if %{with i3}
%files i3
%files identity-i3
%{_prefix}/lib/os-release.i3
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.i3
-%endif
-%if %{with lxde}
%files lxde
%files identity-lxde
%{_prefix}/lib/os-release.lxde
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.lxde
-%endif
-%if %{with lxqt}
%files lxqt
%files identity-lxqt
%{_prefix}/lib/os-release.lxqt
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.lxqt
-%endif
-%if %{with budgie}
+
%files budgie
%files identity-budgie
%{_prefix}/lib/os-release.budgie
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.budgie
-%endif
-%if %{with sway}
%files sway
%files identity-sway
%{_prefix}/lib/os-release.sway
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sway
%{_sysconfdir}/dnf/protected.d/fedora-sway.conf
-%endif
-%if %{with sway_atomic}
%files sway-atomic
%files identity-sway-atomic
%{_prefix}/lib/os-release.sway-atomic
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.sway-atomic
-%endif
-%if %{with budgie_atomic}
+
%files budgie-atomic
%files identity-budgie-atomic
%{_prefix}/lib/os-release.budgie-atomic
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.budgie-atomic
-%endif
-%if %{with mobility}
%files mobility
%files identity-mobility
%{_prefix}/lib/os-release.mobility
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.mobility
-%endif
-%if %{with miraclewm}
%files miraclewm
%files identity-miraclewm
%{_prefix}/lib/os-release.miraclewm
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.miraclewm
%{_sysconfdir}/dnf/protected.d/fedora-miraclewm.conf
-%endif
-%if %{with miraclewm_atomic}
%files miraclewm-atomic
%files identity-miraclewm-atomic
%{_prefix}/lib/os-release.miraclewm-atomic
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.miraclewm-atomic
-%endif
-%if %{with cosmic}
%files cosmic
%files identity-cosmic
%{_prefix}/lib/os-release.cosmic
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic
%{_sysconfdir}/dnf/protected.d/fedora-cosmic.conf
-%endif
-%if %{with cosmic_atomic}
%files cosmic-atomic
%files identity-cosmic-atomic
%{_prefix}/lib/os-release.cosmic-atomic
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.cosmic-atomic
-%endif
-%if %{with wsl}
+
%files wsl
%files identity-wsl
%{_prefix}/lib/os-release.wsl
%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.wsl
-%endif
%changelog
reply other threads:[~2026-08-10 9:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=178635462355.1.9133647014191289374.rpms-fedora-release-53e08d5b85b0@fedoraproject.org \
--to=yselkowi@redhat.com \
--cc=git-commits@fedoraproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox