Diffstat (limited to 'teams')
| -rw-r--r-- | teams/asahi.xml | 2 | ||||
| -rw-r--r-- | teams/cloud/container.xml | 53 | ||||
| -rw-r--r-- | teams/designsuite.xml | 4 | ||||
| -rw-r--r-- | teams/eln/cloud.xml | 2 | ||||
| -rw-r--r-- | teams/eln/container.xml | 22 | ||||
| -rw-r--r-- | teams/eln/desktop-environments.xml | 7 | ||||
| -rw-r--r-- | teams/eln/liveprofiles.xml | 4 | ||||
| -rw-r--r-- | teams/eln/wsl.xml | 2 | ||||
| -rw-r--r-- | teams/games.xml | 34 | ||||
| -rw-r--r-- | teams/sway.xml | 4 |
10 files changed, 63 insertions, 71 deletions
diff --git a/teams/asahi.xml b/teams/asahi.xml index 4d89966..87d84c2 100644 --- a/teams/asahi.xml +++ b/teams/asahi.xml @@ -35,6 +35,8 @@ <package name="mesa-dri-drivers.i686"/> <package name="mesa-vulkan-drivers.x86_64"/> <package name="mesa-vulkan-drivers.i686"/> + <package name="mesa-va-drivers.x86_64"/> + <package name="mesa-va-drivers.i686"/> <package name="mesa-demos.x86_64"/> <package name="libglvnd-opengl.x86_64"/> <package name="libglvnd-opengl.i686"/> diff --git a/teams/cloud/container.xml b/teams/cloud/container.xml index 25dcd49..ee329cf 100644 --- a/teams/cloud/container.xml +++ b/teams/cloud/container.xml @@ -17,16 +17,21 @@ <type image="oci"> <containerconfig name="fedora" - tag="45" + tag="rawhide" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> <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.version" value="45"/> + <label name="org.opencontainers.image.license" value="MIT"/> + <label name="org.opencontainers.image.name" value="fedora"/> + <label name="org.opencontainers.image.version" value="rawhide"/> + <!-- 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="rawhide"/> </labels> <environment> <env name="container" value="oci"/> @@ -43,16 +48,21 @@ <type image="oci"> <containerconfig name="fedora-minimal" - tag="45" + tag="rawhide" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> <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-minimal"/> - <label name="org.opencontainers.image.version" value="45"/> + <label name="org.opencontainers.image.license" value="MIT"/> + <label name="org.opencontainers.image.name" value="fedora-minimal"/> + <label name="org.opencontainers.image.version" value="rawhide"/> + <!-- Legacy attributes for backward compatibility --> + <label name="vendor" value="Fedora Project"/> + <label name="license" value="MIT"/> + <label name="name" value="fedora-minimal"/> + <label name="version" value="rawhide"/> </labels> <environment> <env name="container" value="oci"/> @@ -69,16 +79,21 @@ <type image="oci"> <containerconfig name="fedora-init" - tag="45" + tag="rawhide" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/sbin/init"/> <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-init"/> - <label name="org.opencontainers.image.version" value="45"/> + <label name="org.opencontainers.image.license" value="MIT"/> + <label name="org.opencontainers.image.name" value="fedora-init"/> + <label name="org.opencontainers.image.version" value="rawhide"/> + <!-- Legacy attributes for backward compatibility --> + <label name="vendor" value="Fedora Project"/> + <label name="license" value="MIT"/> + <label name="name" value="fedora-init"/> + <label name="version" value="rawhide"/> </labels> <stopsignal>SIGRTMIN+3</stopsignal> </containerconfig> @@ -92,17 +107,22 @@ <type image="oci"> <containerconfig name="fedora-toolbox" - tag="45" + tag="rawhide" maintainer="Fedora Project Contributors <devel@lists.fedoraproject.org>" > <subcommand execute="/bin/bash"/> <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.version" value="45"/> + <label name="org.opencontainers.image.license" value="MIT"/> + <label name="org.opencontainers.image.name" value="fedora-toolbox"/> + <label name="org.opencontainers.image.version" value="rawhide"/> <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="rawhide"/> </labels> <environment> <env name="container" value="oci"/> @@ -231,6 +251,7 @@ <package name="man-db"/> <package name="man-pages"/> <package name="mesa-dri-drivers"/> + <package name="mesa-va-drivers" arch="aarch64,ppc64le,x86_64,riscv64"/> <!-- doesn't exist in s390x --> <package name="mesa-vulkan-drivers"/> <package name="mtr"/> <package name="nss-mdns"/> diff --git a/teams/designsuite.xml b/teams/designsuite.xml index a50ed6b..4a146ad 100644 --- a/teams/designsuite.xml +++ b/teams/designsuite.xml @@ -21,9 +21,7 @@ <!-- <package name="deja-dup"/> --> <!-- Add extra gnome applications --> <package name="gnome-calendar"/> - <package name="gnome-shell-extension-gsconnect"/> - <!-- Some convertible devices have broken automatic screen rotation on GNOME Wayland --> - <package name="gnome-shell-extension-screen-autorotate"/> + <package name="gnome-pomodoro"/> <package name="gnome-todo"/> <!-- Add cosmetic for terminal --> <package name="powerline"/> 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..4b9bbf3 100644 --- a/teams/eln/desktop-environments.xml +++ b/teams/eln/desktop-environments.xml @@ -7,9 +7,6 @@ <profile name="KDE-Desktop" description="KDE Plasma Desktop"> <requires profile="DesktopCommon"/> </profile> - <profile name="COSMIC-Desktop" description="COSMIC Desktop"> - <requires profile="DesktopCommon"/> - </profile> </profiles> <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> <package name="fedora-eln-backgrounds"/> @@ -32,7 +29,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"/> @@ -43,7 +39,4 @@ <ignore name="plasma-nm-vpnc"/> <package name="fuse"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop"> - <namedCollection name="cosmic-desktop-environment"/> - </packages> </image> diff --git a/teams/eln/liveprofiles.xml b/teams/eln/liveprofiles.xml index 05f7acb..1dec143 100644 --- a/teams/eln/liveprofiles.xml +++ b/teams/eln/liveprofiles.xml @@ -8,9 +8,5 @@ <requires profile="KDE-Desktop"/> <requires profile="LiveInstall"/> </profile> - <profile name="COSMIC-Live" description="COSMIC Live DVD"> - <requires profile="COSMIC-Desktop"/> - <requires profile="LiveInstall"/> - </profile> </profiles> </image> 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"> diff --git a/teams/games.xml b/teams/games.xml index fdfa829..68aca92 100644 --- a/teams/games.xml +++ b/teams/games.xml @@ -1,10 +1,7 @@ <image> <profiles> - <profile name="GamesKDEDesktop" description="KDE Desktop packages for Games Lab"> - <requires profile="DesktopCommon"/> - </profile> <profile name="GamesDesktop" description="Desktop packages for Games Lab"> - <requires profile="GamesKDEDesktop"/> + <requires profile="Xfce-Desktop"/> </profile> <profile name="Games-Live" description="Games Lab Live DVD"> <requires profile="GamesDesktop"/> @@ -15,37 +12,16 @@ <requires profile="BootDiskCore"/> </profile> </profiles> - <packages type="bootstrap" patternType="plusRecommended" profiles="GamesKDEDesktop"> - <package name="fedora-release-kde"/> - </packages> - <packages type="image" patternType="plusRecommended" profiles="GamesKDEDesktop"> - <!-- install env-group to resolve RhBug:1891500 --> - <namedCollection name="kde-desktop-environment"/> - <namedCollection name="kde-apps"/> - <namedCollection name="kde-media"/> - <namedCollection name="firefox"/> - <namedCollection name="x86-emulation" arch="aarch64"/> - <package name="kde-l10n"/> - <ignore name="gnome-disk-utility"/> <!-- redundant with kde partitionmanager --> - <ignore name="mariadb-server-utils"/> <!-- Not needed on desktops (pagure.io:fedora-kde/SIG#566) --> - <ignore name="system-config-language"/> <!-- redundant with kcms --> - <ignore name="system-config-printer"/> <!-- redundant with kcms --> - <!-- drop tracker stuff pulled in by gtk3 (pagureio:fedora-kde/SIG#124) --> - <ignore name="tracker"/> - <ignore name="tracker-miners"/> - <!-- space issues --> - <ignore name="digikam"/> <!-- digikam has duplicate functionality with gwenview (~28 megs) --> - <ignore name="k3b"/> <!-- ~15 megs --> - <ignore name="kipi-plugins"/> <!-- ~8 megs + drags in marble --> - <ignore name="krusader"/> <!-- ~4 megs --> - <ignore name="ktorrent"/> <!-- ~15 megs --> - <ignore name="initial-setup"/> <!-- redundant with plasma-setup --> + <packages type="bootstrap" patternType="plusRecommended" profiles="GamesDesktop"> + <package name="fedora-release"/> </packages> <packages type="image" patternType="plusRecommended" profiles="GamesDesktop"> <!-- The point of this is to show off Fedora games, not running Windows ones --> <ignore name="wine"/> <!-- Remove LibreOffice, we're here to have fun! --> <ignore name="libreoffice*"/> + <!-- Extra screensavers aren't much help for the games lab --> + <ignore name="xscreensaver-extras"/> <!-- Allow joysticks and gamepads to work --> <package name="joystick-support"/> <package name="steam-devices"/> diff --git a/teams/sway.xml b/teams/sway.xml index a7c7074..2888b87 100644 --- a/teams/sway.xml +++ b/teams/sway.xml @@ -12,8 +12,4 @@ <packages type="bootstrap" patternType="plusRecommended" profiles="Sway-Live,Sway-Disk"> <package name="fedora-release-sway"/> </packages> - <packages type="image" patternType="plusRecommended" profiles="Sway-Live"> - <!-- Required to display installation instructions --> - <package name="nwg-wrapper"/> - </packages> </image> |