From 7c611d9d0d82ce03200b690cd1e6eeb9f0792277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timoth=C3=A9e=20Ravier?= Date: Sat, 6 Apr 2019 18:38:45 +0200 Subject: [PATCH] Convert all remaining json manifests to yaml This conversion can be validated using this script: #!/bin/bash mkdir -p repo && cd repo && ostree init --repo . --mode=archive && cd .. variants=('silverblue' 'kinoite' 'xfce' 'lxqt') for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.yaml.out done git checkout --quiet HEAD~ for v in ${variants[@]}; do sudo rpm-ostree compose tree --repo=repo --print-only fedora-$v.yaml > $v.json.out done for v in ${variants[@]}; do if [[ ! -z $(diff $v.json.out $v.yaml.out) ]]; then echo "" echo "$v: JSON != YAML" diff $v.json.out $v.yaml.out echo "" has_diff="true" fi done git checkout --quiet master rm -rf ./repo for v in ${variants[@]}; do rm ./$v.json.out ./$v.yaml.out done if [[ $has_diff == "true" ]]; then echo "Found some diff!" else echo "OK!" fi --- fedora-common-ostree-pkgs.json | 238 --------------------------------- fedora-common-ostree-pkgs.yaml | 235 ++++++++++++++++++++++++++++++++ fedora-common-ostree.json | 44 ------ fedora-common-ostree.yaml | 58 ++++++++ fedora-kinoite.yaml | 2 +- fedora-lxqt.yaml | 3 +- fedora-silverblue.yaml | 4 +- fedora-xfce.yaml | 5 +- gnome-desktop-pkgs.json | 67 ---------- gnome-desktop-pkgs.yaml | 63 +++++++++ kde-desktop-pkgs.json | 45 ------- kde-desktop-pkgs.yaml | 42 ++++++ lxqt-desktop-pkgs.json | 36 ----- lxqt-desktop-pkgs.yaml | 33 +++++ xfce-desktop-pkgs.json | 62 --------- xfce-desktop-pkgs.yaml | 59 ++++++++ 16 files changed, 498 insertions(+), 498 deletions(-) delete mode 100644 fedora-common-ostree-pkgs.json create mode 100644 fedora-common-ostree-pkgs.yaml delete mode 100644 fedora-common-ostree.json create mode 100644 fedora-common-ostree.yaml delete mode 100644 gnome-desktop-pkgs.json create mode 100644 gnome-desktop-pkgs.yaml delete mode 100644 kde-desktop-pkgs.json create mode 100644 kde-desktop-pkgs.yaml delete mode 100644 lxqt-desktop-pkgs.json create mode 100644 lxqt-desktop-pkgs.yaml delete mode 100644 xfce-desktop-pkgs.json create mode 100644 xfce-desktop-pkgs.yaml diff --git a/fedora-common-ostree-pkgs.json b/fedora-common-ostree-pkgs.json deleted file mode 100644 index 4176382..0000000 --- a/fedora-common-ostree-pkgs.json +++ /dev/null @@ -1,238 +0,0 @@ -{ - "00packages-comment": "DO NOT EDIT! This content is generated from comps-sync.py", - "packages": [ - "NetworkManager", - "NetworkManager-bluetooth", - "NetworkManager-config-connectivity-fedora", - "NetworkManager-wifi", - "NetworkManager-wwan", - "PackageKit-gstreamer-plugin", - "aajohan-comfortaa-fonts", - "abattis-cantarell-fonts", - "acl", - "adwaita-qt4", - "adwaita-qt5", - "alsa-plugins-pulseaudio", - "alsa-ucm", - "alsa-utils", - "atmel-firmware", - "attr", - "audit", - "b43-fwcutter", - "b43-openfwwf", - "basesystem", - "bash", - "bash-completion", - "bc", - "bind-utils", - "bluez-cups", - "bridge-utils", - "btrfs-progs", - "bzip2", - "chrony", - "cifs-utils", - "colord", - "coreutils", - "cpio", - "cryptsetup", - "cups", - "cups-filters", - "curl", - "cyrus-sasl-plain", - "dejavu-sans-fonts", - "dejavu-sans-mono-fonts", - "dejavu-serif-fonts", - "dhcp-client", - "dnsmasq", - "e2fsprogs", - "ethtool", - "fedora-bookmarks", - "fedora-release-workstation", - "fedora-user-agent-chrome", - "fedora-workstation-backgrounds", - "file", - "filesystem", - "firefox", - "firewalld", - "foomatic", - "foomatic-db-ppds", - "fpaste", - "fros-gnome", - "gamemode", - "glibc", - "glibc-all-langpacks", - "glx-utils", - "gnu-free-mono-fonts", - "gnu-free-sans-fonts", - "gnu-free-serif-fonts", - "gnupg2", - "google-noto-emoji-color-fonts", - "google-noto-sans-cjk-ttc-fonts", - "google-noto-sans-sinhala-fonts", - "google-noto-serif-cjk-ttc-fonts", - "gstreamer1-plugins-bad-free", - "gstreamer1-plugins-good", - "gutenprint", - "gutenprint-cups", - "hostname", - "hplip", - "hunspell", - "hyperv-daemons", - "ibus-gtk2", - "ibus-gtk3", - "ibus-hangul", - "ibus-kkc", - "ibus-libpinyin", - "ibus-libzhuyin", - "ibus-m17n", - "ibus-qt", - "ibus-typing-booster", - "iproute", - "iptables", - "iptstate", - "iputils", - "ipw2100-firmware", - "ipw2200-firmware", - "iwl100-firmware", - "iwl1000-firmware", - "iwl105-firmware", - "iwl135-firmware", - "iwl2000-firmware", - "iwl2030-firmware", - "iwl3160-firmware", - "iwl3945-firmware", - "iwl4965-firmware", - "iwl5000-firmware", - "iwl5150-firmware", - "iwl6000-firmware", - "iwl6000g2a-firmware", - "iwl6000g2b-firmware", - "iwl6050-firmware", - "iwl7260-firmware", - "jomolhari-fonts", - "julietaula-montserrat-fonts", - "kbd", - "kernel", - "kernel-modules-extra", - "khmeros-base-fonts", - "less", - "liberation-mono-fonts", - "liberation-sans-fonts", - "liberation-serif-fonts", - "libertas-usb8388-firmware", - "linux-firmware", - "logrotate", - "lohit-assamese-fonts", - "lohit-bengali-fonts", - "lohit-devanagari-fonts", - "lohit-gujarati-fonts", - "lohit-gurmukhi-fonts", - "lohit-kannada-fonts", - "lohit-odia-fonts", - "lohit-tamil-fonts", - "lohit-telugu-fonts", - "lrzsz", - "lsof", - "man-db", - "man-pages", - "mcelog", - "mdadm", - "mesa-dri-drivers", - "mesa-vulkan-drivers", - "microcode_ctl", - "mlocate", - "mpage", - "mtr", - "nfs-utils", - "nss-altfiles", - "nss-mdns", - "ntfsprogs", - "open-vm-tools-desktop", - "openssh-clients", - "openssh-server", - "paktype-naskh-basic-fonts", - "pam_krb5", - "paps", - "paratype-pt-sans-fonts", - "passwd", - "passwdqc", - "pciutils", - "pinfo", - "plymouth", - "plymouth-system-theme", - "policycoreutils", - "policycoreutils-python-utils", - "procps-ng", - "psmisc", - "pulseaudio", - "pulseaudio-module-x11", - "pulseaudio-utils", - "qemu-guest-agent", - "qt", - "qt-settings", - "qt-x11", - "qt5-qtbase", - "qt5-qtbase-gui", - "qt5-qtdeclarative", - "qt5-qtxmlpatterns", - "quota", - "realmd", - "rng-tools", - "rootfiles", - "rp-pppoe", - "rpm", - "rsync", - "samba-client", - "scl-utils", - "selinux-policy-targeted", - "setup", - "shadow-utils", - "sil-abyssinica-fonts", - "sil-mingzat-fonts", - "sil-nuosu-fonts", - "sil-padauk-fonts", - "smc-meera-fonts", - "sos", - "spice-vdagent", - "sssd", - "sssd-common", - "sssd-kcm", - "stix-fonts", - "sudo", - "system-config-printer-udev", - "systemd", - "systemd-udev", - "tar", - "thai-scalable-waree-fonts", - "time", - "tree", - "unzip", - "usb_modeswitch", - "usbutils", - "util-linux", - "vconfig", - "vim-minimal", - "virtualbox-guest-additions", - "wget", - "which", - "wireless-tools", - "words", - "xorg-x11-drv-ati", - "xorg-x11-drv-evdev", - "xorg-x11-drv-fbdev", - "xorg-x11-drv-intel", - "xorg-x11-drv-libinput", - "xorg-x11-drv-nouveau", - "xorg-x11-drv-openchrome", - "xorg-x11-drv-qxl", - "xorg-x11-drv-vesa", - "xorg-x11-drv-vmware", - "xorg-x11-drv-wacom", - "xorg-x11-server-Xorg", - "xorg-x11-utils", - "xorg-x11-xauth", - "xorg-x11-xinit", - "zd1211-firmware", - "zip" - ] -} diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml new file mode 100644 index 0000000..255f7e3 --- /dev/null +++ b/fedora-common-ostree-pkgs.yaml @@ -0,0 +1,235 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +packages: + - NetworkManager + - NetworkManager-bluetooth + - NetworkManager-config-connectivity-fedora + - NetworkManager-wifi + - NetworkManager-wwan + - PackageKit-gstreamer-plugin + - aajohan-comfortaa-fonts + - abattis-cantarell-fonts + - acl + - adwaita-qt4 + - adwaita-qt5 + - alsa-plugins-pulseaudio + - alsa-ucm + - alsa-utils + - atmel-firmware + - attr + - audit + - b43-fwcutter + - b43-openfwwf + - basesystem + - bash + - bash-completion + - bc + - bind-utils + - bluez-cups + - bridge-utils + - btrfs-progs + - bzip2 + - chrony + - cifs-utils + - colord + - coreutils + - cpio + - cryptsetup + - cups + - cups-filters + - curl + - cyrus-sasl-plain + - dejavu-sans-fonts + - dejavu-sans-mono-fonts + - dejavu-serif-fonts + - dhcp-client + - dnsmasq + - e2fsprogs + - ethtool + - fedora-bookmarks + - fedora-release-workstation + - fedora-user-agent-chrome + - fedora-workstation-backgrounds + - file + - filesystem + - firefox + - firewalld + - foomatic + - foomatic-db-ppds + - fpaste + - fros-gnome + - gamemode + - glibc + - glibc-all-langpacks + - glx-utils + - gnu-free-mono-fonts + - gnu-free-sans-fonts + - gnu-free-serif-fonts + - gnupg2 + - google-noto-emoji-color-fonts + - google-noto-sans-cjk-ttc-fonts + - google-noto-sans-sinhala-fonts + - google-noto-serif-cjk-ttc-fonts + - gstreamer1-plugins-bad-free + - gstreamer1-plugins-good + - gutenprint + - gutenprint-cups + - hostname + - hplip + - hunspell + - hyperv-daemons + - ibus-gtk2 + - ibus-gtk3 + - ibus-hangul + - ibus-kkc + - ibus-libpinyin + - ibus-libzhuyin + - ibus-m17n + - ibus-qt + - ibus-typing-booster + - iproute + - iptables + - iptstate + - iputils + - ipw2100-firmware + - ipw2200-firmware + - iwl100-firmware + - iwl1000-firmware + - iwl105-firmware + - iwl135-firmware + - iwl2000-firmware + - iwl2030-firmware + - iwl3160-firmware + - iwl3945-firmware + - iwl4965-firmware + - iwl5000-firmware + - iwl5150-firmware + - iwl6000-firmware + - iwl6000g2a-firmware + - iwl6000g2b-firmware + - iwl6050-firmware + - iwl7260-firmware + - jomolhari-fonts + - julietaula-montserrat-fonts + - kbd + - kernel + - kernel-modules-extra + - khmeros-base-fonts + - less + - liberation-mono-fonts + - liberation-sans-fonts + - liberation-serif-fonts + - libertas-usb8388-firmware + - linux-firmware + - logrotate + - lohit-assamese-fonts + - lohit-bengali-fonts + - lohit-devanagari-fonts + - lohit-gujarati-fonts + - lohit-gurmukhi-fonts + - lohit-kannada-fonts + - lohit-odia-fonts + - lohit-tamil-fonts + - lohit-telugu-fonts + - lrzsz + - lsof + - man-db + - man-pages + - mcelog + - mdadm + - mesa-dri-drivers + - mesa-vulkan-drivers + - microcode_ctl + - mlocate + - mpage + - mtr + - nfs-utils + - nss-altfiles + - nss-mdns + - ntfsprogs + - open-vm-tools-desktop + - openssh-clients + - openssh-server + - paktype-naskh-basic-fonts + - pam_krb5 + - paps + - paratype-pt-sans-fonts + - passwd + - passwdqc + - pciutils + - pinfo + - plymouth + - plymouth-system-theme + - policycoreutils + - policycoreutils-python-utils + - procps-ng + - psmisc + - pulseaudio + - pulseaudio-module-x11 + - pulseaudio-utils + - qemu-guest-agent + - qt + - qt-settings + - qt-x11 + - qt5-qtbase + - qt5-qtbase-gui + - qt5-qtdeclarative + - qt5-qtxmlpatterns + - quota + - realmd + - rng-tools + - rootfiles + - rp-pppoe + - rpm + - rsync + - samba-client + - scl-utils + - selinux-policy-targeted + - setup + - shadow-utils + - sil-abyssinica-fonts + - sil-mingzat-fonts + - sil-nuosu-fonts + - sil-padauk-fonts + - smc-meera-fonts + - sos + - spice-vdagent + - sssd + - sssd-common + - sssd-kcm + - stix-fonts + - sudo + - system-config-printer-udev + - systemd + - systemd-udev + - tar + - thai-scalable-waree-fonts + - time + - tree + - unzip + - usb_modeswitch + - usbutils + - util-linux + - vconfig + - vim-minimal + - virtualbox-guest-additions + - wget + - which + - wireless-tools + - words + - xorg-x11-drv-ati + - xorg-x11-drv-evdev + - xorg-x11-drv-fbdev + - xorg-x11-drv-intel + - xorg-x11-drv-libinput + - xorg-x11-drv-nouveau + - xorg-x11-drv-openchrome + - xorg-x11-drv-qxl + - xorg-x11-drv-vesa + - xorg-x11-drv-vmware + - xorg-x11-drv-wacom + - xorg-x11-server-Xorg + - xorg-x11-utils + - xorg-x11-xauth + - xorg-x11-xinit + - zd1211-firmware + - zip diff --git a/fedora-common-ostree.json b/fedora-common-ostree.json deleted file mode 100644 index 69c8579..0000000 --- a/fedora-common-ostree.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "ref": "fedora/rawhide/${basearch}/ostree-base", - - "automatic_version_prefix": "31", - "mutate-os-release": "31", - - "include": "fedora-common-ostree-pkgs.json", - - "packages": [ - "buildah", - "flatpak", - "flatpak-builder", - "git-core", - "lvm2", - "podman", - "rpm-ostree", - "skopeo", - "toolbox", - "xdg-desktop-portal" - ], - - "selinux": true, - "documentation": true, - "boot_location": "new", - "etc-group-members": ["wheel"], - "tmp-is-dir": true, - - "postprocess-script": "post.sh", - - "ignore-removed-users": ["root"], - "ignore-removed-groups": ["root"], - "check-passwd": { "type": "file", "filename": "passwd" }, - "check-groups": { "type": "file", "filename": "group" }, - - "default_target": "graphical.target", - - "comment-for-packages": "Keep this in sync with fedora-atomic-host.json from fedora-atomic", - "packages-aarch64": ["grub2-efi", "ostree-grub2", "efibootmgr", "shim"], - "packages-armhfp": ["extlinux-bootloader"], - "packages-ppc64": ["grub2", "ostree-grub2"], - "packages-ppc64le": ["grub2", "ostree-grub2"], - "packages-x86_64": ["grub2", "grub2-efi-x64", "ostree-grub2", - "efibootmgr", "shim", "microcode_ctl"] -} diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml new file mode 100644 index 0000000..feece1e --- /dev/null +++ b/fedora-common-ostree.yaml @@ -0,0 +1,58 @@ +ref: fedora/rawhide/${basearch}/ostree-base + +automatic_version_prefix: "31" +mutate-os-release: "31" + +include: fedora-common-ostree-pkgs.yaml + +packages: + - buildah + - flatpak + - flatpak-builder + - git-core + - lvm2 + - podman + - rpm-ostree + - skopeo + - toolbox + - xdg-desktop-portal + +selinux: true +documentation: true +boot_location: new +etc-group-members: + - wheel +tmp-is-dir: true + +postprocess-script: post.sh + +ignore-removed-users: + - root +ignore-removed-groups: + - root +check-passwd: { type: file, filename: passwd } +check-groups: { type: file, filename: group } + +default_target: graphical.target + +# Keep this in sync with fedora-atomic-host.json from fedora-atomic +packages-aarch64: + - grub2-efi + - ostree-grub2 + - efibootmgr + - shim +packages-armhfp: + - extlinux-bootloader +packages-ppc64: + - grub2 + - ostree-grub2 +packages-ppc64le: + - grub2 + - ostree-grub2 +packages-x86_64: + - grub2 + - grub2-efi-x64 + - ostree-grub2 + - efibootmgr + - shim + - microcode_ctl diff --git a/fedora-kinoite.yaml b/fedora-kinoite.yaml index 1539ba8..815cde7 100644 --- a/fedora-kinoite.yaml +++ b/fedora-kinoite.yaml @@ -1,4 +1,4 @@ -include: kde-desktop-pkgs.json +include: kde-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/kinoite rojig: name: fedora-kde diff --git a/fedora-lxqt.yaml b/fedora-lxqt.yaml index 1921714..354701e 100644 --- a/fedora-lxqt.yaml +++ b/fedora-lxqt.yaml @@ -1,4 +1,4 @@ -include: lxqt-desktop-pkgs.json +include: lxqt-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/lxqt rojig: name: fedora-lxqt @@ -6,6 +6,7 @@ rojig: license: MIT packages: - libqtxdg + # Portals for Flatpak - xdg-desktop-portal-kde repos: diff --git a/fedora-silverblue.yaml b/fedora-silverblue.yaml index 90258a3..a16db70 100644 --- a/fedora-silverblue.yaml +++ b/fedora-silverblue.yaml @@ -1,4 +1,4 @@ -include: gnome-desktop-pkgs.json +include: gnome-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/silverblue rojig: name: fedora-silverblue @@ -11,7 +11,7 @@ packages: # Does it really still make sense to ship Qt by default if we # expect people to run apps in containers? - qgnomeplatform - # hfs filesystem tools for Apple hardware + # HFS filesystem tools for Apple hardware # See https://github.com/projectatomic/rpm-ostree/issues/1380 - hfsplus-tools # Bundle the minimal -devel packages needed to build a kernel. diff --git a/fedora-xfce.yaml b/fedora-xfce.yaml index 07c8e6a..4655808 100644 --- a/fedora-xfce.yaml +++ b/fedora-xfce.yaml @@ -1,10 +1,11 @@ -include: xfce-desktop-pkgs.json +include: xfce-desktop-pkgs.yaml ref: fedora/rawhide/${basearch}/xfce rojig: name: fedora-xfce summary: "Fedora XFCE base image" license: MIT packages: - - xdg-desktop-portal-gtk + # Portals for Flatpak + - xdg-desktop-portal-gtk repos: - fedora-rawhide diff --git a/gnome-desktop-pkgs.json b/gnome-desktop-pkgs.json deleted file mode 100644 index f543442..0000000 --- a/gnome-desktop-pkgs.json +++ /dev/null @@ -1,67 +0,0 @@ -{ - "00packages-comment": "DO NOT EDIT! This content is generated from comps-sync.py", - "include": "fedora-common-ostree.json", - "packages": [ - "ModemManager", - "NetworkManager-adsl", - "NetworkManager-openconnect-gnome", - "NetworkManager-openvpn-gnome", - "NetworkManager-ppp", - "NetworkManager-pptp-gnome", - "NetworkManager-ssh-gnome", - "NetworkManager-vpnc-gnome", - "NetworkManager-wwan", - "adobe-source-code-pro-fonts", - "at-spi2-atk", - "at-spi2-core", - "avahi", - "chrome-gnome-shell", - "dconf", - "gdm", - "glib-networking", - "gnome-backgrounds", - "gnome-bluetooth", - "gnome-characters", - "gnome-classic-session", - "gnome-color-manager", - "gnome-control-center", - "gnome-disk-utility", - "gnome-getting-started-docs", - "gnome-initial-setup", - "gnome-remote-desktop", - "gnome-session-wayland-session", - "gnome-session-xsession", - "gnome-settings-daemon", - "gnome-shell", - "gnome-software", - "gnome-system-monitor", - "gnome-terminal", - "gnome-terminal-nautilus", - "gnome-themes-extra", - "gnome-user-docs", - "gnome-user-share", - "gvfs-afc", - "gvfs-afp", - "gvfs-archive", - "gvfs-fuse", - "gvfs-goa", - "gvfs-gphoto2", - "gvfs-mtp", - "gvfs-smb", - "libcanberra-gtk2", - "libcanberra-gtk3", - "libproxy-mozjs", - "librsvg2", - "libsane-hpaio", - "mesa-libEGL", - "mousetweaks", - "polkit", - "rygel", - "tracker", - "tracker-miners", - "xdg-desktop-portal", - "xdg-desktop-portal-gtk", - "xdg-user-dirs-gtk", - "yelp" - ] -} diff --git a/gnome-desktop-pkgs.yaml b/gnome-desktop-pkgs.yaml new file mode 100644 index 0000000..1d76c57 --- /dev/null +++ b/gnome-desktop-pkgs.yaml @@ -0,0 +1,63 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +include: fedora-common-ostree.yaml +packages: + - ModemManager + - NetworkManager-adsl + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-ppp + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-vpnc-gnome + - NetworkManager-wwan + - adobe-source-code-pro-fonts + - at-spi2-atk + - at-spi2-core + - avahi + - chrome-gnome-shell + - dconf + - gdm + - glib-networking + - gnome-backgrounds + - gnome-bluetooth + - gnome-classic-session + - gnome-color-manager + - gnome-control-center + - gnome-disk-utility + - gnome-getting-started-docs + - gnome-initial-setup + - gnome-remote-desktop + - gnome-session-wayland-session + - gnome-session-xsession + - gnome-settings-daemon + - gnome-shell + - gnome-software + - gnome-system-monitor + - gnome-terminal + - gnome-terminal-nautilus + - gnome-themes-extra + - gnome-user-docs + - gnome-user-share + - gvfs-afc + - gvfs-afp + - gvfs-archive + - gvfs-fuse + - gvfs-goa + - gvfs-gphoto2 + - gvfs-mtp + - gvfs-smb + - libcanberra-gtk2 + - libcanberra-gtk3 + - libproxy-mozjs + - librsvg2 + - libsane-hpaio + - mesa-libEGL + - mousetweaks + - polkit + - rygel + - tracker + - tracker-miners + - xdg-desktop-portal + - xdg-desktop-portal-gtk + - xdg-user-dirs-gtk + - yelp diff --git a/kde-desktop-pkgs.json b/kde-desktop-pkgs.json deleted file mode 100644 index 9374b4a..0000000 --- a/kde-desktop-pkgs.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "00packages-comment": "DO NOT EDIT! This content is generated from comps-sync.py", - "include": "fedora-common-ostree.json", - "packages": [ - "NetworkManager-config-connectivity-fedora", - "bluedevil", - "breeze-icon-theme", - "glibc-all-langpacks", - "initial-setup-gui", - "kde-gtk-config", - "kde-print-manager", - "kde-settings-pulseaudio", - "kdeplasma-addons", - "kdialog", - "kf5-akonadi-server", - "kf5-akonadi-server-mysql", - "kf5-baloo-file", - "khotkeys", - "kinfocenter", - "kmousetool", - "konsole5", - "kscreen", - "kscreenlocker", - "ksysguard", - "kwalletmanager5", - "kwin", - "pam-kwallet", - "phonon-qt5-backend-gstreamer", - "plasma-breeze", - "plasma-desktop", - "plasma-discover", - "plasma-drkonqi", - "plasma-nm", - "plasma-pa", - "plasma-user-manager", - "plasma-workspace", - "polkit-kde", - "qt5-qtbase-gui", - "qt5-qtdeclarative", - "sddm", - "sddm-breeze", - "sddm-kcm", - "xorg-x11-drv-libinput" - ] -} diff --git a/kde-desktop-pkgs.yaml b/kde-desktop-pkgs.yaml new file mode 100644 index 0000000..d5b6db2 --- /dev/null +++ b/kde-desktop-pkgs.yaml @@ -0,0 +1,42 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +include: fedora-common-ostree.yaml +packages: + - NetworkManager-config-connectivity-fedora + - bluedevil + - breeze-icon-theme + - glibc-all-langpacks + - initial-setup-gui + - kde-gtk-config + - kde-print-manager + - kde-settings-pulseaudio + - kdeplasma-addons + - kdialog + - kf5-akonadi-server + - kf5-akonadi-server-mysql + - kf5-baloo-file + - khotkeys + - kinfocenter + - kmousetool + - konsole5 + - kscreen + - kscreenlocker + - ksysguard + - kwalletmanager5 + - kwin + - pam-kwallet + - phonon-qt5-backend-gstreamer + - plasma-breeze + - plasma-desktop + - plasma-discover + - plasma-drkonqi + - plasma-nm + - plasma-pa + - plasma-user-manager + - plasma-workspace + - polkit-kde + - qt5-qtbase-gui + - qt5-qtdeclarative + - sddm + - sddm-breeze + - sddm-kcm + - xorg-x11-drv-libinput diff --git a/lxqt-desktop-pkgs.json b/lxqt-desktop-pkgs.json deleted file mode 100644 index a111b42..0000000 --- a/lxqt-desktop-pkgs.json +++ /dev/null @@ -1,36 +0,0 @@ -{ - "00packages-comment": "DO NOT EDIT! This content is generated from comps-sync.py", - "include": "fedora-common-ostree.json", - "packages": [ - "breeze-cursor-theme", - "breeze-gtk", - "breeze-icon-theme", - "fedora-icon-theme", - "firewall-config", - "initial-setup-gui", - "lxqt-about", - "lxqt-config", - "lxqt-globalkeys", - "lxqt-notificationd", - "lxqt-openssh-askpass", - "lxqt-panel", - "lxqt-policykit", - "lxqt-powermanagement", - "lxqt-qtplugin", - "lxqt-runner", - "lxqt-session", - "lxqt-themes", - "lxqt-themes-fedora", - "network-manager-applet", - "nm-connection-editor", - "notification-daemon", - "obconf", - "openbox", - "perl-File-MimeInfo", - "qterminal", - "sddm", - "sddm-themes", - "upower", - "xdg-user-dirs" - ] -} diff --git a/lxqt-desktop-pkgs.yaml b/lxqt-desktop-pkgs.yaml new file mode 100644 index 0000000..f415132 --- /dev/null +++ b/lxqt-desktop-pkgs.yaml @@ -0,0 +1,33 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +include: fedora-common-ostree.yaml +packages: + - breeze-cursor-theme + - breeze-gtk + - breeze-icon-theme + - fedora-icon-theme + - firewall-config + - initial-setup-gui + - lxqt-about + - lxqt-config + - lxqt-globalkeys + - lxqt-notificationd + - lxqt-openssh-askpass + - lxqt-panel + - lxqt-policykit + - lxqt-powermanagement + - lxqt-qtplugin + - lxqt-runner + - lxqt-session + - lxqt-themes + - lxqt-themes-fedora + - network-manager-applet + - nm-connection-editor + - notification-daemon + - obconf + - openbox + - perl-File-MimeInfo + - qterminal + - sddm + - sddm-themes + - upower + - xdg-user-dirs diff --git a/xfce-desktop-pkgs.json b/xfce-desktop-pkgs.json deleted file mode 100644 index 4871ada..0000000 --- a/xfce-desktop-pkgs.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "00packages-comment": "DO NOT EDIT! This content is generated from comps-sync.py", - "include": "fedora-common-ostree.json", - "packages": [ - "NetworkManager-fortisslvpn-gnome", - "NetworkManager-iodine-gnome", - "NetworkManager-l2tp-gnome", - "NetworkManager-libreswan-gnome", - "NetworkManager-openconnect-gnome", - "NetworkManager-openvpn-gnome", - "NetworkManager-pptp-gnome", - "NetworkManager-ssh-gnome", - "NetworkManager-sstp-gnome", - "NetworkManager-strongswan-gnome", - "NetworkManager-vpnc-gnome", - "adwaita-gtk2-theme", - "adwaita-icon-theme", - "albatross-gtk2-theme", - "albatross-gtk3-theme", - "albatross-xfwm4-theme", - "arc-theme", - "blueberry", - "bluebird-gtk2-theme", - "bluebird-gtk3-theme", - "bluebird-xfwm4-theme", - "desktop-backgrounds-compat", - "fedora-icon-theme", - "gnome-keyring-pam", - "greybird-gtk2-theme", - "greybird-gtk3-theme", - "greybird-xfce4-notifyd-theme", - "greybird-xfwm4-theme", - "gtk-xfce-engine", - "gvfs", - "gvfs-archive", - "gvfs-mtp", - "initial-setup-gui", - "lightdm-gtk", - "network-manager-applet", - "nm-connection-editor", - "xdg-user-dirs-gtk", - "xfce4-about", - "xfce4-appfinder", - "xfce4-datetime-plugin", - "xfce4-panel", - "xfce4-places-plugin", - "xfce4-power-manager", - "xfce4-pulseaudio-plugin", - "xfce4-screenshooter-plugin", - "xfce4-session", - "xfce4-session-engines", - "xfce4-settings", - "xfce4-taskmanager", - "xfce4-terminal", - "xfconf", - "xfdesktop", - "xfwm4", - "xfwm4-theme-nodoka", - "xfwm4-themes", - "xscreensaver-base" - ] -} diff --git a/xfce-desktop-pkgs.yaml b/xfce-desktop-pkgs.yaml new file mode 100644 index 0000000..d212b6c --- /dev/null +++ b/xfce-desktop-pkgs.yaml @@ -0,0 +1,59 @@ +# DO NOT EDIT! This content is generated from comps-sync.py +include: fedora-common-ostree.yaml +packages: + - NetworkManager-fortisslvpn-gnome + - NetworkManager-iodine-gnome + - NetworkManager-l2tp-gnome + - NetworkManager-libreswan-gnome + - NetworkManager-openconnect-gnome + - NetworkManager-openvpn-gnome + - NetworkManager-pptp-gnome + - NetworkManager-ssh-gnome + - NetworkManager-sstp-gnome + - NetworkManager-strongswan-gnome + - NetworkManager-vpnc-gnome + - adwaita-gtk2-theme + - adwaita-icon-theme + - albatross-gtk2-theme + - albatross-gtk3-theme + - albatross-xfwm4-theme + - arc-theme + - blueberry + - bluebird-gtk2-theme + - bluebird-gtk3-theme + - bluebird-xfwm4-theme + - desktop-backgrounds-compat + - fedora-icon-theme + - gnome-keyring-pam + - greybird-gtk2-theme + - greybird-gtk3-theme + - greybird-xfce4-notifyd-theme + - greybird-xfwm4-theme + - gtk-xfce-engine + - gvfs + - gvfs-archive + - gvfs-mtp + - initial-setup-gui + - lightdm-gtk + - network-manager-applet + - nm-connection-editor + - xdg-user-dirs-gtk + - xfce4-about + - xfce4-appfinder + - xfce4-datetime-plugin + - xfce4-panel + - xfce4-places-plugin + - xfce4-power-manager + - xfce4-pulseaudio-plugin + - xfce4-screenshooter-plugin + - xfce4-session + - xfce4-session-engines + - xfce4-settings + - xfce4-taskmanager + - xfce4-terminal + - xfconf + - xfdesktop + - xfwm4 + - xfwm4-theme-nodoka + - xfwm4-themes + - xscreensaver-base