Diffstat (limited to 'components/desktops')
| -rw-r--r-- | components/desktops/budgie.xml | 1 | ||||
| -rw-r--r-- | components/desktops/cinnamon.xml | 5 | ||||
| -rw-r--r-- | components/desktops/common.xml | 12 | ||||
| -rw-r--r-- | components/desktops/cosmic.xml | 11 | ||||
| -rw-r--r-- | components/desktops/gnome.xml | 4 | ||||
| -rw-r--r-- | components/desktops/i3.xml | 2 | ||||
| -rw-r--r-- | components/desktops/kde.xml | 42 | ||||
| -rw-r--r-- | components/desktops/lxde.xml | 2 | ||||
| -rw-r--r-- | components/desktops/lxqt.xml | 12 | ||||
| -rw-r--r-- | components/desktops/mate.xml | 3 | ||||
| -rw-r--r-- | components/desktops/miraclewm.xml | 14 | ||||
| -rw-r--r-- | components/desktops/phosh.xml | 6 | ||||
| -rw-r--r-- | components/desktops/soas.xml | 5 | ||||
| -rw-r--r-- | components/desktops/sway.xml | 2 | ||||
| -rw-r--r-- | components/desktops/xfce.xml | 2 |
15 files changed, 80 insertions, 43 deletions
diff --git a/components/desktops/budgie.xml b/components/desktops/budgie.xml index 42ebab7..36ae5cf 100644 --- a/components/desktops/budgie.xml +++ b/components/desktops/budgie.xml @@ -9,7 +9,6 @@ <namedCollection name="budgie-desktop-environment"/> <namedCollection name="budgie-desktop-apps"/> <namedCollection name="libreoffice"/> - <package name="fedora-release-budgie"/> <package name="libreoffice-draw"/> <package name="libreoffice-math"/> <package name="thunderbird"/> diff --git a/components/desktops/cinnamon.xml b/components/desktops/cinnamon.xml index 61fc852..3bd5a4e 100644 --- a/components/desktops/cinnamon.xml +++ b/components/desktops/cinnamon.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="Cinnamon-Desktop" description="Cinnamon Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -9,8 +8,6 @@ <!-- install env-group to resolve RhBug:1891500 --> <namedCollection name="cinnamon-desktop-environment"/> <namedCollection name="libreoffice"/> - <package name="fedora-release-cinnamon"/> - <package name="rhythmbox"/> - <package name="f39-backgrounds-extras-gnome"/> <!-- extra backgrounds --> + <package name="exaile"/> </packages> </image> diff --git a/components/desktops/common.xml b/components/desktops/common.xml index 08d6956..fed17c4 100644 --- a/components/desktops/common.xml +++ b/components/desktops/common.xml @@ -1,17 +1,17 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> + <profile name="DesktopCommon" description="Common desktop packages"> + <requires profile="BaseCommon"/> + <requires profile="HardwareCommon"/> + </profile> </profiles> <packages type="image" patternType="plusRecommended" profiles="DesktopCommon"> - <namedCollection name="internet-browser"/> <namedCollection name="fonts"/> <namedCollection name="multimedia"/> <namedCollection name="networkmanager-submodules"/> - <namedCollection name="office-suite"/> - <namedCollection name="hardware-support"/> - <namedCollection name="print-client"/> + <namedCollection name="printing"/> <namedCollection name="guest-desktop-agents"/> - <namedCollection name="standard"/> + <package name="mediawriter"/> <ignore name="gfs2-utils"/> <ignore name="reiserfs-utils"/> </packages> diff --git a/components/desktops/cosmic.xml b/components/desktops/cosmic.xml new file mode 100644 index 0000000..4d010a7 --- /dev/null +++ b/components/desktops/cosmic.xml @@ -0,0 +1,11 @@ +<image> + <profiles> + <profile name="COSMIC-Desktop" description="COSMIC Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="COSMIC-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="cosmic-desktop-environment"/> + </packages> +</image> diff --git a/components/desktops/gnome.xml b/components/desktops/gnome.xml index f0836ed..17ffc36 100644 --- a/components/desktops/gnome.xml +++ b/components/desktops/gnome.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="GNOME-Desktop" description="GNOME Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -8,6 +7,7 @@ <packages type="image" patternType="plusRecommended" profiles="GNOME-Desktop"> <!-- install env-group to resolve RhBug:1891500 --> <namedCollection name="workstation-product-environment"/> - <package name="fedora-release-workstation"/> + <!-- space saving, see https://bugzilla.redhat.com/show_bug.cgi?id=2360056#c45 --> + <ignore name="python3-boto3"/> </packages> </image> diff --git a/components/desktops/i3.xml b/components/desktops/i3.xml index ae2464d..26e73d2 100644 --- a/components/desktops/i3.xml +++ b/components/desktops/i3.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="i3-Desktop" description="i3 Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -8,7 +7,6 @@ <packages type="image" patternType="plusRecommended" profiles="i3-Desktop"> <!-- install env-group to resolve RhBug:1891500 --> <namedCollection name="i3-desktop-environment"/> - <namedCollection name="admin-tools"/> <package name="dex-autostart"/> <package name="fedora-release-i3"/> <package name="feh"/> diff --git a/components/desktops/kde.xml b/components/desktops/kde.xml index df379ff..4c20ea5 100644 --- a/components/desktops/kde.xml +++ b/components/desktops/kde.xml @@ -1,21 +1,51 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="KDE-Desktop" description="KDE Plasma Desktop"> <requires profile="DesktopCommon"/> </profile> + <profile name="KDE-Mobile" description="KDE Plasma Mobile"> + <requires profile="DesktopCommon"/> + </profile> </profiles> + <!-- Common exclusions for KDE variants --> + <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop,KDE-Mobile"> + <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> <packages type="image" patternType="plusRecommended" profiles="KDE-Desktop"> <!-- install env-group to resolve RhBug:1891500 --> <namedCollection name="kde-desktop-environment"/> <namedCollection name="kde-apps"/> <namedCollection name="kde-media"/> - <namedCollection name="kde-spin-initial-setup"/> + <namedCollection name="kde-pim" arch="aarch64,ppc64le,x86_64"/> + <namedCollection name="firefox"/> + <namedCollection name="libreoffice"/> + <namedCollection name="x86-emulation" arch="aarch64"/> + <package name="libreoffice-draw"/> + <package name="libreoffice-math"/> + <package name="fuse"/> + <package name="kde-l10n"/> + </packages> + <packages type="image" patternType="plusRecommended" profiles="KDE-Mobile"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="kde-mobile-environment"/> + <namedCollection name="firefox"/> + <namedCollection name="x86-emulation" arch="aarch64"/> <package name="fuse"/> - <package name="fedora-release-kde"/> <package name="kde-l10n"/> - <ignore name="@admin-tools"/> - <ignore name="gnome-disk-utility"/> - <ignore name="system-config-printer"/> + <ignore name="plasma-welcome"/> + <ignore name="plasma-welcome-fedora"/> </packages> </image> diff --git a/components/desktops/lxde.xml b/components/desktops/lxde.xml index dc527ae..b14e097 100644 --- a/components/desktops/lxde.xml +++ b/components/desktops/lxde.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="LXDE-Desktop" description="LXDE Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -11,7 +10,6 @@ <namedCollection name="lxde-apps"/> <namedCollection name="lxde-media"/> <namedCollection name="lxde-office"/> - <package name="fedora-release-lxde"/> <package name="lxpolkit"/> <!-- Ensure LXDE polkit agent is used --> <package name="notification-daemon"/> <!-- Ensure correct notification daemon is used --> <ignore name="PackageKit*"/> <!-- we use dnfdragora instead --> diff --git a/components/desktops/lxqt.xml b/components/desktops/lxqt.xml index 6cf7462..af700f2 100644 --- a/components/desktops/lxqt.xml +++ b/components/desktops/lxqt.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="LXQt-Desktop" description="LXQt Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -11,12 +10,6 @@ <namedCollection name="lxqt-apps"/> <namedCollection name="lxqt-media"/> <namedCollection name="lxqt-l10n"/> - <package name="fedora-release-lxqt"/> - <package name="lximage-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> - <package name="obconf-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> - <package name="pavucontrol-qt-l10n"/> <!-- FIXME: put in lxqt-l10n comps group --> - <package name="enki"/> <!-- FIXME: put in comps --> - <package name="udisks2"/> <!-- Fix https://bugzilla.redhat.com/show_bug.cgi?id=1429132 --> <!-- remove unneeded stuff for a lightweight system --> <package name="wqy-microhei-fonts"/> <!-- compact CJK font --> <ignore name="naver-nanum-gothic-fonts"/> <!-- Korean: replaced by above --> @@ -24,10 +17,13 @@ <ignore name="adobe-source-han-sans-cn-fonts"/> <!-- Simplified Chinese: replaced by above --> <ignore name="adobe-source-han-sans-tw-fonts"/> <!-- Traditional Chinese: replaced by above --> <ignore name="pt-sans-fonts"/> <!-- Cyrillic (already supported by DejaVu) --> + <!-- these do not currently work: https://pagure.io/fedora-kiwi-descriptions/issue/112 <ignore name="@input-methods"/> - <ignore name="@admin-tools"/> + --> + <!-- because the input-methods group exclusion doesn't work, these aren't safe <ignore name="scim*"/> <ignore name="m17n*"/> <ignore name="iok"/> + --> </packages> </image> diff --git a/components/desktops/mate.xml b/components/desktops/mate.xml index e48d8a3..bcc577d 100644 --- a/components/desktops/mate.xml +++ b/components/desktops/mate.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="MATE-Desktop" description="MATE Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -10,11 +9,9 @@ <namedCollection name="mate-desktop-environment"/> <namedCollection name="compiz"/> <namedCollection name="libreoffice"/> - <package name="fedora-release-matecompiz"/> <ignore name="audacious"/> <!-- breaks the desktop --> <!-- drop things for size --> <ignore name="@3d-printing"/> - <ignore name="@admin-tools"/> <ignore name="@mate-applications"/> <ignore name="brasero"/> <ignore name="fedora-icon-theme"/> diff --git a/components/desktops/miraclewm.xml b/components/desktops/miraclewm.xml new file mode 100644 index 0000000..f986915 --- /dev/null +++ b/components/desktops/miraclewm.xml @@ -0,0 +1,14 @@ +<image> + <profiles> + <profile name="MiracleWM-Desktop" description="MiracleWM Desktop"> + <requires profile="DesktopCommon"/> + </profile> + </profiles> + <packages type="image" patternType="plusRecommended" profiles="MiracleWM-Desktop"> + <!-- install env-group to resolve RhBug:1891500 --> + <namedCollection name="miraclewm-desktop-environment"/> + <namedCollection name="firefox"/> + <package name="initial-setup-gui"/> + <package name="initial-setup-gui-wayland-miraclewm"/> + </packages> +</image> diff --git a/components/desktops/phosh.xml b/components/desktops/phosh.xml index 1d3c7a5..7362244 100644 --- a/components/desktops/phosh.xml +++ b/components/desktops/phosh.xml @@ -1,13 +1,15 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="Phosh-Desktop" description="Phosh Desktop"> <requires profile="DesktopCommon"/> </profile> </profiles> + <packages type="bootstrap" patternType="plusRecommended" profiles="Phosh-Desktop"> + <package name="fedora-release-mobility"/> + </packages> <packages type="image" patternType="plusRecommended" profiles="Phosh-Desktop"> <!-- install env-group to resolve RhBug:1891500 --> <namedCollection name="phosh-desktop-environment"/> - <package name="fedora-release-phosh"/> + <package name="initial-setup-gui-wayland-generic"/> </packages> </image> diff --git a/components/desktops/soas.xml b/components/desktops/soas.xml index b4d6763..f91802a 100644 --- a/components/desktops/soas.xml +++ b/components/desktops/soas.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="SoaS-Desktop" description="SoaS Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -8,7 +7,6 @@ <packages type="image" patternType="plusRecommended" profiles="SoaS-Desktop"> <!-- install env-group to resolve RhBug:1891500 --> <namedCollection name="sugar-desktop-environment"/> - <package name="fedora-release-soas"/> <package name="dejavu-sans-fonts"/> <package name="dejavu-sans-mono-fonts"/> <package name="madan-fonts"/> @@ -16,8 +14,9 @@ <package name="sil-abyssinica-fonts"/> <package name="vlgothic-fonts"/> <package name="rp-pppoe"/> <!-- See http://bugs.sugarlabs.org/ticket/1951 --> - <package name="livecd-tools"/> <!-- See http://bugs.sugarlabs.org/ticket/74 --> + <package name="livecd-iso-to-mediums" arch="x86_64"/> <!-- See http://bugs.sugarlabs.org/ticket/74 --> <package name="xfce-polkit"/> + <package name="initial-setup-gui-wayland-generic"/> <ignore name="@gnome-desktop"/> <ignore name="firefox"/> <ignore name="ibus*"/> diff --git a/components/desktops/sway.xml b/components/desktops/sway.xml index 64b5084..e6777f2 100644 --- a/components/desktops/sway.xml +++ b/components/desktops/sway.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="Sway-Desktop" description="Sway Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -10,6 +9,5 @@ <namedCollection name="sway-desktop-environment"/> <namedCollection name="firefox"/> <namedCollection name="swaywm-extended"/> - <package name="fedora-release-sway"/> </packages> </image> diff --git a/components/desktops/xfce.xml b/components/desktops/xfce.xml index a7e0229..141d52e 100644 --- a/components/desktops/xfce.xml +++ b/components/desktops/xfce.xml @@ -1,6 +1,5 @@ <image> <profiles> - <profile name="DesktopCommon" description="Common desktop packages"/> <profile name="Xfce-Desktop" description="Xfce Desktop"> <requires profile="DesktopCommon"/> </profile> @@ -12,7 +11,6 @@ <namedCollection name="xfce-extra-plugins"/> <namedCollection name="xfce-media"/> <namedCollection name="xfce-office"/> - <package name="fedora-release-xfce"/> <package name="wget"/> <package name="system-config-printer"/> <!-- Save some space --> |