Merge branch 'main' into webkitgtk-removal

minimization · Oct 9, 2023 · cc182a7 · cc182a7
2 parents 8e88698 + 8d64400
commit cc182a7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 25 deletions.
diff --git a/configs/sst_cs_apps-python-crb.yaml b/configs/sst_cs_apps-python-crb.yaml
@@ -24,6 +24,7 @@ data:
   - python3-psutil-tests
   - py3c-devel
   - py3c-doc
+  - marshalparser
   # the following packages are anticipated to be used by pyproject-rpm-macros
   # in the feature, so we want them in CRB early,
   # rather than going trough a tad tedious process to add them after GA

diff --git a/configs/sst_desktop-glade.yaml b/configs/sst_desktop-glade.yaml
@@ -9,5 +9,4 @@ data:
   - glade
 
   labels:
-  - eln
   - c9s
diff --git a/configs/sst_desktop-unwanted-eln.yaml b/configs/sst_desktop-unwanted-eln.yaml
@@ -95,10 +95,11 @@ data:
   # Replaced by tecla
   - libgnomekbd
   - libxklavier
-
+  
   unwanted_source_packages:
   # The only supported way in RHEL to render HTML content is Firefox
   - webkitgtk
-
+  # Obsoleted upstream for nearly 10 years
+  - glade
   labels:
   - eln
diff --git a/configs/sst_desktop_applications-evolution-data-server.yaml b/configs/sst_desktop_applications-evolution-data-server.yaml
@@ -0,0 +1,15 @@
+document: feedback-pipeline-workload
+version: 1
+data:
+  name: Evolution Data Server
+  description: Unified backend for programs that work with contacts, tasks, and calendar information
+  maintainer: sst_desktop_applications
+
+  packages:
+  - evolution-data-server
+  - evolution-data-server-langpacks
+  - evolution-ews
+  - evolution-ews-langpacks
+
+  labels:
+  - eln
diff --git a/configs/sst_desktop_applications-evolution-eln.yaml b/configs/sst_desktop_applications-evolution-eln.yaml
diff --git a/configs/sst_desktop_applications-unwanted-eln.yaml b/configs/sst_desktop_applications-unwanted-eln.yaml
@@ -98,6 +98,9 @@ data:
   - enchant
   # Replaced by Loupe
   - eog
+  # Thunderbird is the only shipped desktop email client in RHEL 10
+  # evolution-data-server stays as it's needed by GNOME
+  - evolution
 
   labels:
   - eln
-Original file line number
+Diff line change
@@ Expand Up / @@ -9,5 +9,4 @@ data: @@
       - glade
       labels:
-      - eln
       - c9s