#158 Small fixes for master branch
Merged 3 years ago by kalev. Opened 4 years ago by siosm.
siosm/workstation-ostree-config master  into  master

file modified
+7 -5
@@ -170,7 +170,6 @@ 

      # Non-critical apps -> Flatpak

      - akregator

      - cagibi

-     - gnome-keyring-pam

      - gwenview

      - kaddressbook

      - kamera
@@ -227,13 +226,16 @@ 

      - firewall-config

      - openssh-askpass

      - vim-enhanced

-     # ?

-     - rodent-icon-theme

+     # Remove uncommon NetworkManager plugins

+     - NetworkManager-fortisslvpn-gnome

+     - NetworkManager-iodine-gnome

+     - NetworkManager-l2tp-gnome

+     - NetworkManager-libreswan-gnome

+     - NetworkManager-sstp-gnome

+     - NetworkManager-strongswan-gnome

    lxqt-desktop:

      # Incompatible with ostree for various reasons

      - dnfdragora-updater

-     # Non-critical apps -> Flatpak

-     - ark

    deepin-desktop:

      # Incompatible with ostree for various reasons

      - dnfdragora-updater

@@ -139,12 +139,12 @@ 

    - nss-altfiles

    - nss-mdns

    - ntfsprogs

-   - opensc

    - openssh-clients

    - openssh-server

    - paktype-naskh-basic-fonts

    - pam_afs_session

    - paps

+   - paratype-pt-sans-fonts

    - passwd

    - passwdqc

    - pciutils
@@ -155,7 +155,6 @@ 

    - policycoreutils-python-utils

    - procps-ng

    - psmisc

-   - pt-sans-fonts

    - pulseaudio

    - pulseaudio-module-x11

    - pulseaudio-utils

file modified
+2
@@ -12,6 +12,8 @@ 

    - xorg-x11-server-Xwayland

    # Portals for Flatpak

    - xdg-desktop-portal-kde

+   # Provide an archive manager by default

+   - ark

  

  repos:

    - fedora-rawhide

file modified
+1 -1
@@ -1,6 +1,6 @@ 

  [fedora-rawhide]

  name=Fedora rawhide $basearch

- #baseurl=http://download.fedoraproject.org/pub/fedora/linux//development/rawhide/$basearch/os/

+ #baseurl=https://download.fedoraproject.org/pub/fedora/linux/development/rawhide/$basearch/os/

  mirrorlist=https://mirrors.fedoraproject.org/metalink?repo=rawhide&arch=$basearch

  enabled=0

  gpgcheck=0

file modified
+1
@@ -6,6 +6,7 @@ 

    - breeze-icon-theme

    - dolphin

    - glibc-all-langpacks

+   - gnome-keyring-pam

    - initial-setup-gui

    - kde-gtk-config

    - kde-print-manager

file modified
+1
@@ -1,6 +1,7 @@ 

  # DO NOT EDIT! This content is generated from comps-sync.py

  include: fedora-common-ostree.yaml

  packages:

+   - ark

    - breeze-cursor-theme

    - breeze-gtk

    - breeze-icon-theme

file modified
+3 -6
@@ -1,17 +1,14 @@ 

  # 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-adsl

    - NetworkManager-openconnect-gnome

    - NetworkManager-openvpn-gnome

+   - NetworkManager-ppp

    - NetworkManager-pptp-gnome

    - NetworkManager-ssh-gnome

-   - NetworkManager-sstp-gnome

-   - NetworkManager-strongswan-gnome

    - NetworkManager-vpnc-gnome

+   - NetworkManager-wwan

    - Thunar

    - adwaita-gtk2-theme

    - adwaita-icon-theme

Collection of small fixes for the master branch. I can split this pull request if necessary.

rebased onto 821689df6b5050b9c1c3091091d68254210fa16f

4 years ago

rebased onto 254bff29ebd138602263721ce9eba42041126890

4 years ago

10 new commits added

  • comps-sync f32 2020-01-19
  • comps-sync f32 2019-12-14
  • blacklist: remove rodent-icon-theme
  • kde & lxqt: keep an archive manager in the base image
  • comps-sync rawhide 2019-11-07
  • Blacklist xorg-x11-drv-armada
  • Blacklist yum
  • fedora-rawhide.repo: use HTTPS
  • Re-add gnome-keyring-pam for KDE variant
  • Blacklist wingpanel-indicator-datetime for Pantheon
4 years ago

10 new commits added

  • comps-sync rawhide (f32) 2020-01-19
  • comps-sync rawhide (f32) 2019-12-14
  • blacklist: remove rodent-icon-theme
  • kde & lxqt: keep an archive manager in the base image
  • comps-sync rawhide 2019-11-07
  • Blacklist xorg-x11-drv-armada
  • Blacklist yum
  • fedora-rawhide.repo: use HTTPS
  • Re-add gnome-keyring-pam for KDE variant
  • Blacklist wingpanel-indicator-datetime for Pantheon
4 years ago

1 new commit added

  • Common packages: Blacklist scl-utils
4 years ago

1 new commit added

  • comps-sync rawhide (f32) 2020-02-07
4 years ago

rebased onto 472d82b67c438b905ef002ee5cfa529617170d35

4 years ago

rebased onto 5280659d4a9b91f3dbfdafa0cd1eba7608b50edd

4 years ago

@siosm would it be possible to rebase this?

rebased onto e14fd0f

3 years ago

Feel free to ask me if you would prefer multiple PRs instead.

Looks good to me! Thanks for the fixes.

Pull-Request has been merged by kalev

3 years ago