Diffstat (limited to 'teams/eln')
| -rw-r--r-- | teams/eln/cloud.xml | 2 | ||||
| -rw-r--r-- | teams/eln/container.xml | 22 | ||||
| -rw-r--r-- | teams/eln/desktop-environments.xml | 1 | ||||
| -rw-r--r-- | teams/eln/wsl.xml | 2 |
4 files changed, 18 insertions, 9 deletions
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml index b146d48..df9a4b0 100644 --- a/teams/eln/cloud.xml +++ b/teams/eln/cloud.xml @@ -199,7 +199,7 @@ </type> </preferences> <packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI"> - <package name="fedora-eln-release"/> + <package name="fedora-release-eln"/> </packages> <packages type="image" patternType="plusRecommended" profiles="CloudCore"> <namedCollection name="cloud-server-environment"/> diff --git a/teams/eln/container.xml b/teams/eln/container.xml index 5eebfb4..13174f6 100644 --- a/teams/eln/container.xml +++ b/teams/eln/container.xml @@ -18,9 +18,14 @@ <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.licenses" value="MIT"/> - <label name="org.opencontainers.image.title" value="fedora"/> + <label name="org.opencontainers.image.license" value="MIT"/> + <label name="org.opencontainers.image.name" value="fedora"/> <label name="org.opencontainers.image.version" value="eln"/> + <!-- Legacy attributes for backward compatibility --> + <label name="vendor" value="Fedora Project"/> + <label name="license" value="MIT"/> + <label name="name" value="fedora"/> + <label name="version" value="eln"/> </labels> <environment> <env name="container" value="oci"/> @@ -43,10 +48,15 @@ <labels> <label name="org.opencontainers.image.vendor" value="Fedora Project"/> <label name="org.opencontainers.image.url" value="https://fedoraproject.org/"/> - <label name="org.opencontainers.image.licenses" value="MIT"/> - <label name="org.opencontainers.image.title" value="fedora-toolbox"/> + <label name="org.opencontainers.image.license" value="MIT"/> + <label name="org.opencontainers.image.name" value="fedora-toolbox"/> <label name="org.opencontainers.image.version" value="eln"/> <label name="com.github.containers.toolbox" value="true"/> + <!-- Legacy attributes for backward compatibility --> + <label name="vendor" value="Fedora Project"/> + <label name="license" value="MIT"/> + <label name="name" value="fedora-toolbox"/> + <label name="version" value="eln"/> </labels> <environment> <env name="container" value="oci"/> @@ -77,7 +87,7 @@ <ignore name="grubby"/> <ignore name="langpacks-en_GB"/> <ignore name="sssd-client"/> - <package name="fedora-eln-release"/> + <package name="fedora-release-eln"/> <package name="bash"/> <package name="coreutils"/> <package name="rpm"/> @@ -130,7 +140,7 @@ <package name="diffutils"/> <package name="dnf5"/> <package name="dnf5-plugins"/> - <package name="fedora-eln-release"/> + <package name="fedora-release-eln"/> <package name="file"/> <package name="findutils"/> <package name="flatpak-spawn"/> diff --git a/teams/eln/desktop-environments.xml b/teams/eln/desktop-environments.xml index c9741b0..6a47168 100644 --- a/teams/eln/desktop-environments.xml +++ b/teams/eln/desktop-environments.xml @@ -32,7 +32,6 @@ <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> <namedCollection name="gnome-desktop"/> <namedCollection name="workstation-product"/> - <package name="gnome-classic-session"/> </packages> <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop"> <namedCollection name="kde-desktop-environment"/> diff --git a/teams/eln/wsl.xml b/teams/eln/wsl.xml index 051f8e6..6918bb3 100644 --- a/teams/eln/wsl.xml +++ b/teams/eln/wsl.xml @@ -14,7 +14,7 @@ <package name="coreutils"/> <package name="dnf5"/> <package name="dnf5-plugins"/> - <package name="fedora-eln-release"/> + <package name="fedora-release-eln"/> <package name="rpm"/> </packages> <packages type="image" patternType="plusRecommended" profiles="WSL-Base"> |