[rpms/fedora-release] f45: Remove ELN from mainline fedora-release

[rpms/fedora-release] f45: Remove ELN from mainline fedora-release

[Yaakov Selkowitz]

            A new commit has been pushed.

            Repo   : rpms/fedora-release
            Branch : f45
            Commit : eb9f7cedbfeb2731ebb5f068e0012581adcc3d15
            Author : Yaakov Selkowitz <yselkowi@redhat.com>
            Date   : 2026-05-01T12:31:20-04:00
            Stats  : +2/-170 in 2 file(s)
            URL    : https://src.fedoraproject.org/rpms/fedora-release/c/eb9f7cedbfeb2731ebb5f068e0012581adcc3d15?branch=f45

            Log:
            Remove ELN from mainline fedora-release

With the common presets split out into redhat-systemd-presets, ELN will use
a separate fedora-eln-release package for easier maintenance for both
Fedora and ELN.

---
diff --git a/75-eln.preset b/75-eln.preset
deleted file mode 100644
index 1bdde76..0000000
--- a/75-eln.preset
+++ /dev/null
@@ -1,6 +0,0 @@
-#
-# Fedora ELN
-#
-# This file contains overrides/additions to the presets in Fedora common and
-# server that are specifically needed for RHEL/CentOS Stream.
-#

diff --git a/fedora-release.spec b/fedora-release.spec
index eddb01a..97a91db 100644
--- a/fedora-release.spec
+++ b/fedora-release.spec
@@ -12,11 +12,7 @@
 
 %if %{is_rawhide}
 %define bug_version rawhide
-%if 0%{?eln}
-  %define releasever eln
-%else
-  %define releasever rawhide
-%endif
+%define releasever rawhide
 %define doc_version rawhide
 %else
 %define bug_version %{dist_version}
@@ -31,7 +27,6 @@
 %bcond container %[%{undefined eln}]
 %bcond coreos %[%{undefined eln}]
 %bcond designsuite %[%{undefined eln}]
-%bcond eln %[%{defined eln}]
 %bcond flatpak %[%{undefined eln}]
 %bcond iot %[%{undefined eln}]
 %bcond kde_desktop %[%{undefined eln}]
@@ -64,7 +59,7 @@
 %global with_ostree_desktop 1
 %endif
 
-%global dist %{?eln:.eln%{eln}}
+%global dist %{nil}
 
 # Changes should be submitted as pull requests under
 #     https://src.fedoraproject.org/rpms/fedora-release
@@ -98,7 +93,6 @@ Source28:       longer-default-shutdown-timeout.conf
 Source29:       org.gnome.settings-daemon.plugins.power.gschema.override
 Source30:       fedora-sway.conf
 Source31:       20-fedora-defaults.conf
-Source32:       75-eln.preset
 Source33:       plasma-mobile.conf
 Source34:       80-kde-mobile.preset
 Source35:       fedora-miraclewm.conf
@@ -134,11 +128,7 @@ Summary: Fedora release files
 Requires:   fedora-release-variant = %{version}-%{release}
 Suggests:   fedora-release
 
-%if %{with eln}
-Requires:   fedora-repos-eln = %{version}
-%else
 Requires:   fedora-repos(%{version})
-%endif
 Requires:   fedora-release-identity = %{version}-%{release}
 
 # We need to ensure that the systemd presets common to all Fedora installs are
@@ -148,7 +138,6 @@ Requires:   redhat-systemd-presets
 
 %if %{is_rawhide}
 # Make $releasever return "rawhide" on Rawhide
-# and "eln" on ELN.
 # https://pagure.io/releng/issue/7445
 Provides:       system-release(releasever) = %{releasever}
 %endif
@@ -421,120 +410,6 @@ itself as Fedora Design Suite Lab.
 %endif
 
 
-%if %{with eln}
-%package eln
-Summary:        Base package for Fedora ELN specific default configurations
-
-RemovePathPostfixes: .eln
-Provides:       fedora-release = %{version}-%{release}
-Provides:       fedora-release-variant = %{version}-%{release}
-Provides:       system-release
-Provides:       system-release(%{version})
-Requires:       fedora-release-common = %{version}-%{release}
-Provides:       system-release-product
-Requires:       fedora-repos-eln
-
-Obsoletes:      redhat-release
-Provides:       redhat-release
-
-# fedora-release-common Requires: fedora-release-identity, so at least one
-# package must provide it. This Recommends: pulls in
-# fedora-release-identity-eln if nothing else is already doing so.
-Recommends:     fedora-release-identity-eln
-
-
-%description eln
-Provides a base package for Fedora ELN specific configuration files to
-depend on.
-
-
-%package identity-eln
-Summary:        Package providing the identity for Fedora ELN
-
-# When running a compose for ELN, we want to make sure that we pull in the
-# correct templates when lorax is installed. This Suggests: will clue
-# libdnf to use this set of templates instead of lorax-templates-generic.
-Suggests: lorax-templates-rhel
-
-# Both netcat and nmap-ncat provide /usr/bin/nc, so prefer the latter like
-# RHEL does.
-Suggests: nmap-ncat
-
-# Prefer over original standalone versions (without pipewire- prefix)
-Suggests: pipewire-jack-audio-connection-kit
-Suggests: pipewire-jack-audio-connection-kit-devel
-Suggests: pipewire-pulseaudio
-
-# Prefer over Lmod for Provides: environment(modules)
-Suggests: environment-modules
-
-# Prefer over elinks, w3m for Provides: text-www-browser
-Suggests: lynx
-
-# Prefer over bind9-next and its subpackages
-Suggests: bind
-Suggests: bind-devel
-Suggests: bind-dnssec-utils
-Suggests: bind-utils
-
-# Default OpenJDK version, prefer over other versions for
-# Provides: java, java-devel, java-headless, maven-jdk-binding, etc.
-Suggests: java-25-openjdk
-Suggests: java-25-openjdk-devel
-Suggests: java-25-openjdk-headless
-Suggests: maven-openjdk25
-Suggests: maven4-openjdk25
-
-# Prefer over Fedora freeipa (same code, different name, each Provides the other)
-Suggests: ipa-client
-Suggests: ipa-client-common
-Suggests: ipa-client-epn
-Suggests: ipa-client-samba
-Suggests: ipa-common
-Suggests: ipa-selinux
-Suggests: ipa-server
-Suggests: ipa-server-common
-Suggests: ipa-server-dns
-Suggests: ipa-server-trust-ad
-Suggests: ipa-healthcheck
-Suggests: ipa-healthcheck-core
-
-# Prefer over exim, opensmtpd, sendmail for Provides: MTA smtpd smtpdaemon server(smtp)
-Suggests: postfix
-
-# Prefer over cdrkit/genisoimage for /usr/bin/mkisofs
-Suggests: xorriso
-
-# Prefer over sdubby which also Provides: grubby
-Suggests: grubby
-
-# Prefer over arptables-legacy, ebtables-legacy, and iptables-legacy
-# for Provides: arptables-helper, ebtables, or iptables
-Suggests: iptables-nft
-
-# Prefer over blis for libblas*.so.3()(64bit)
-Suggests: blas
-Suggests: blas64
-
-# Prefer over wget2-wget for wget
-Suggests: wget1-wget
-
-# Prefer over fedora-logos(-httpd) for system-logos(-httpd)
-Suggests: fedora-eln-logos
-Suggests: fedora-eln-logos-httpd
-
-RemovePathPostfixes: .eln
-Provides:       fedora-release-identity = %{version}-%{release}
-Conflicts:      fedora-release-identity
-Requires(meta): fedora-release-eln = %{version}-%{release}
-
-
-%description identity-eln
-Provides the necessary files for a Fedora installation that is identifying
-itself as Fedora ELN.
-%endif
-
-
 %if %{with flatpak}
 %package flatpak
 Summary:        Base package for Fedora flatpak specific default configurations
@@ -1709,7 +1584,6 @@ ln -s fedora-release %{buildroot}%{_sysconfdir}/system-release
 # The namespace for purl
 # https://github.com/package-url/purl-spec
 # for example as in: pkg:rpm/fedora/python-setuptools@69.2.0-10.fc41?arch=src"
-# Note that we use "fedora" even for Fedora ELN
 %global dist_purl_namespace fedora
 
 # URL of the homepage of the distribution
@@ -1849,24 +1723,6 @@ sed -i -e 's|HOME_URL=.*|HOME_URL="https://labs.fedoraproject.org"|' %{buildroot
 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 eln}
-# ELN
-cp -p os-release \
-      %{buildroot}%{_prefix}/lib/os-release.eln
-echo "VARIANT=\"ELN\"" >> %{buildroot}%{_prefix}/lib/os-release.eln
-echo "VARIANT_ID=eln" >> %{buildroot}%{_prefix}/lib/os-release.eln
-sed -i -e 's|PRETTY_NAME=.*|PRETTY_NAME="Fedora ELN"|' %{buildroot}/%{_prefix}/lib/os-release.eln
-sed -i -e 's|DOCUMENTATION_URL=.*|DOCUMENTATION_URL="https://docs.fedoraproject.org/en-US/eln/"|' %{buildroot}%{_prefix}/lib/os-release.eln
-sed -i -e "/^DEFAULT_HOSTNAME=/d" %{buildroot}%{_prefix}/lib/os-release.eln
-sed -e "s#\$version#%{bug_version}#g" -e 's/$edition/ELN/;s/<!--.*-->//;/^$/d' %{SOURCE20} > %{buildroot}%{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.eln
-
-# ELN installs the Server presets as well
-install -Dm0644 %{SOURCE14} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
-
-# ELN may override some presets from Fedora to simplify branching for CentOS Stream
-install -Dm0644 %{SOURCE32} -t %{buildroot}%{_prefix}/lib/systemd/system-preset/
-%endif
-
 %if %{with flatpak}
 # Flatpak
 cp -p os-release \
@@ -2197,17 +2053,9 @@ cat >> %{buildroot}%{_rpmconfigdir}/macros.d/macros.dist << EOF
 # dist macros.
 
 %%__bootstrap         ~bootstrap
-%if 0%{?eln}
-%%rhel              %{rhel_dist_version}
-%%el%{rhel_dist_version}                1
-# Although eln is set in koji tags, we put it in the macros.dist file for local and mock builds.
-%%eln              %{eln}
-%%distcore            .eln%%{eln}
-%else
 %%fedora              %{dist_version}
 %%fc%{dist_version}                1
 %%distcore            .fc%%{fedora}
-%endif
 %%dist                %%{!?distprefix0:%%{?distprefix}}%%{expand:%%{lua:for i=0,9999 do print("%%{?distprefix" .. i .."}") end}}%%{distcore}%%{?with_bootstrap:%%{__bootstrap}}%%{?buildrelease:+build%%{buildrelease}}
 %%dist_vendor         %{dist_vendor}
 %%dist_name           %{dist_name}
@@ -2310,16 +2158,6 @@ install -Dm0644 %{SOURCE31} -t %{buildroot}%{_prefix}/share/dnf5/libdnf.conf.d/
 %endif
 
 
-%if %{with eln}
-%files eln
-%files identity-eln
-%{_prefix}/lib/os-release.eln
-%{_prefix}/lib/systemd/system-preset/80-server.preset
-%{_prefix}/lib/systemd/system-preset/75-eln.preset
-%attr(0644,root,root) %{_swidtagdir}/org.fedoraproject.Fedora-edition.swidtag.eln
-%endif
-
-
 %if %{with flatpak}
 %files flatpak
 %files identity-flatpak