Merge branch 'i9.5' of git.inferitos.ru:msvsphere/pungi-msvsphere into i9.5

comps-aarch64.xml

@@ -5949,7 +5949,7 @@
       <packagereq variant="AppStream" type="mandatory">vsftpd</packagereq>
     </packagelist>
   </group>
-  <group variant="Devel">
+  <group variant="AppStream">
     <id>gnome-apps</id>
     <name>GNOME Applications</name>
     <name xml:lang="as">GNOME এপ্লিকেচনসমূহ</name>
@@ -6007,8 +6007,8 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Devel" type="mandatory">brasero</packagereq>
+      <packagereq variant="AppStream" type="mandatory">brasero</packagereq>
-      <packagereq variant="Devel" type="mandatory">brasero-nautilus</packagereq>
+      <packagereq variant="AppStream" type="mandatory">brasero-nautilus</packagereq>
     </packagelist>
   </group>
   <group variant="BaseOS">
@@ -6175,6 +6175,7 @@
       <packagereq variant="AppStream" type="mandatory">at-spi2-core</packagereq>
       <packagereq variant="AppStream" type="mandatory">avahi-tools</packagereq>
       <packagereq variant="AppStream" type="mandatory">baobab</packagereq>
+      <packagereq variant="AppStream" type="mandatory">cheese</packagereq>
       <packagereq variant="AppStream" type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq variant="AppStream" type="mandatory">dconf</packagereq>
       <packagereq variant="AppStream" type="mandatory">eog</packagereq>
@@ -6439,6 +6440,7 @@
       <packagereq variant="Server" type="mandatory">avahi-tools</packagereq>
       <packagereq variant="Server" type="mandatory">baobab</packagereq>
       <packagereq variant="Server" type="mandatory">celluloid</packagereq>
+      <packagereq variant="Server" type="mandatory">cheese</packagereq>
       <packagereq variant="Server" type="mandatory">chrome-gnome-shell</packagereq>
       <packagereq variant="Server" type="mandatory">dconf</packagereq>
       <packagereq variant="Server" type="mandatory">eog</packagereq>
@@ -11567,7 +11569,7 @@
       <packagereq variant="Minimal" type="default">NetworkManager-wwan</packagereq>
     </packagelist>
   </group>
-  <group variant="Devel">
+  <group variant="AppStream">
     <id>office-suite</id>
     <name>Office Suite and Productivity</name>
     <name xml:lang="as">কাৰ্যালয় গোট আৰু কাৰ্য্যক্ষমতা</name>
@@ -11632,17 +11634,17 @@
     <default>false</default>
     <uservisible>false</uservisible>
     <packagelist>
-      <packagereq variant="Devel" type="default">libreoffice-calc</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-calc</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-draw</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-draw</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-emailmerge</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-emailmerge</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-graphicfilter</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-graphicfilter</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-impress</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-impress</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-math</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-math</packagereq>
-      <packagereq variant="Devel" type="default">libreoffice-writer</packagereq>
+      <packagereq variant="AppStream" type="default">libreoffice-writer</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-base</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-base</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-ogltrans</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-ogltrans</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-pyuno</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-pyuno</packagereq>
-      <packagereq variant="Devel" type="optional">libreoffice-wiki-publisher</packagereq>
+      <packagereq variant="AppStream" type="optional">libreoffice-wiki-publisher</packagereq>
     </packagelist>
   </group>
   <group variant="AppStream">
@@ -17501,60 +17503,12 @@
       <groupid>standard</groupid>
       <groupid>workstation-product</groupid>
     </grouplist>
-    <optionlist>
-      <groupid>backup-client</groupid>
-      <groupid>headless-management</groupid>
-      <groupid>internet-applications</groupid>
-      <groupid>internet-browser-firefox</groupid>
-      <groupid>remote-desktop-clients</groupid>
-      <groupid>smart-card</groupid>
-    </optionlist>
-  </environment>
-  <environment variant="Devel">
-    <id>workstation-product-environment</id>
-    <name>Workstation</name>
-    <name xml:lang="de">Arbeitsplatz</name>
-    <name xml:lang="es">Estación de trabajo</name>
-    <name xml:lang="fr">Station de travail</name>
-    <name xml:lang="it">Postazione di lavoro</name>
-    <name xml:lang="ja">ワークステーション</name>
-    <name xml:lang="ko">워크스테이션</name>
-    <name xml:lang="pt_BR">Workstation</name>
-    <name xml:lang="ru">Рабочая станция</name>
-    <name xml:lang="zh_CN">工作站</name>
-    <name xml:lang="zh_TW">工作站</name>
-    <description>Workstation is a user-friendly desktop system for laptops and PCs.</description>
-    <description xml:lang="de">Workstation ist ein benutzerfreundliches Desktop-System für Laptops und PCs.</description>
-    <description xml:lang="es">Workstation es un sistema de escritorio fácil de usar para ordenadores portátiles y PC.</description>
-    <description xml:lang="fr">Une station de travail est un système de bureau convivial pour les ordinateurs portables et les PC.</description>
-    <description xml:lang="it">Workstation è un sistema desktop di facile utilizzo per computer portatili e PC.</description>
-    <description xml:lang="ja">ノートパソコンおよび PC 向けのユーザーフレンドリーなデスクト>ップシステムです。</description>
-    <description xml:lang="ko">워크스테이션은 사용자 친화적인 랩탑 및 PC 용 데스크탑 시스템>입니다.</description>
-    <description xml:lang="pt">Workstation é um sistema de desktop amigável para laptops e PCs.</description>
-    <description xml:lang="pt_BR">Workstation é um sistema de desktop amigável para laptops e PCs.</description>
-    <description xml:lang="ru">Рабочая станция - это удобная для пользователя настольная система для ноутбуков и ПК.</description>
-    <description xml:lang="zh_CN">工作站是用户友好的笔记本电脑和 PC 的桌面系统。</description>
-    <description xml:lang="zh_TW">Workstation是一款面向筆記本電腦和PC的用戶友好型桌面系統。</description>
-    <display_order>4</display_order>
-    <grouplist>
-      <groupid>base-x</groupid>
-      <groupid>core</groupid>
-      <groupid>fonts</groupid>
-      <groupid>gnome-desktop</groupid>
-      <groupid>guest-desktop-agents</groupid>
-      <groupid>hardware-support</groupid>
-      <groupid>internet-browser</groupid>
-      <groupid>multimedia</groupid>
-      <groupid>networkmanager-submodules</groupid>
-      <groupid>print-client</groupid>
-      <groupid>standard</groupid>
-      <groupid>workstation-product</groupid>
-    </grouplist>
     <optionlist>
       <groupid>backup-client</groupid>
       <groupid>gnome-apps</groupid>
       <groupid>headless-management</groupid>
       <groupid>internet-applications</groupid>
+      <groupid>internet-browser-firefox</groupid>
       <groupid>office-suite</groupid>
       <groupid>remote-desktop-clients</groupid>
       <groupid>smart-card</groupid>
@@ -18203,8 +18157,10 @@
     <display_order>80</display_order>
     <grouplist>
       <groupid>emacs</groupid>
+      <groupid>gnome-apps</groupid>
       <groupid>graphics</groupid>
       <groupid>internet-applications</groupid>
+      <groupid>office-suite</groupid>
     </grouplist>
   </category>
   <category>

prepopulate-aarch64.json

@@ -5040,31 +5040,149 @@
         "autocorr-vi.noarch",
         "autocorr-vro.noarch",
         "autocorr-zh.noarch",
-        "libreoffice-calc.aarch64",
+        "libreoffice.x86_64",
-        "libreoffice-core.aarch64",
+        "libreoffice-base.x86_64",
+        "libreoffice-calc.x86_64",
+        "libreoffice-core.x86_64",
         "libreoffice-data.noarch",
-        "libreoffice-graphicfilter.aarch64",
+        "libreoffice-draw.x86_64",
-        "libreoffice-help-en.aarch64",
+        "libreoffice-emailmerge.x86_64",
-        "libreoffice-impress.aarch64",
+        "libreoffice-filters.x86_64",
-        "libreoffice-langpack-en.aarch64",
+        "libreoffice-gdb-debug-support.x86_64",
-        "libreoffice-ogltrans.aarch64",
+        "libreoffice-graphicfilter.x86_64",
+        "libreoffice-gtk3.x86_64",
+        "libreoffice-help-ar.x86_64",
+        "libreoffice-help-bg.x86_64",
+        "libreoffice-help-bn.x86_64",
+        "libreoffice-help-ca.x86_64",
+        "libreoffice-help-cs.x86_64",
+        "libreoffice-help-da.x86_64",
+        "libreoffice-help-de.x86_64",
+        "libreoffice-help-dz.x86_64",
+        "libreoffice-help-el.x86_64",
+        "libreoffice-help-en.x86_64",
+        "libreoffice-help-eo.x86_64",
+        "libreoffice-help-es.x86_64",
+        "libreoffice-help-et.x86_64",
+        "libreoffice-help-eu.x86_64",
+        "libreoffice-help-fi.x86_64",
+        "libreoffice-help-fr.x86_64",
+        "libreoffice-help-gl.x86_64",
+        "libreoffice-help-gu.x86_64",
+        "libreoffice-help-he.x86_64",
+        "libreoffice-help-hi.x86_64",
+        "libreoffice-help-hr.x86_64",
+        "libreoffice-help-hu.x86_64",
+        "libreoffice-help-id.x86_64",
+        "libreoffice-help-it.x86_64",
+        "libreoffice-help-ja.x86_64",
+        "libreoffice-help-ko.x86_64",
+        "libreoffice-help-lt.x86_64",
+        "libreoffice-help-lv.x86_64",
+        "libreoffice-help-nb.x86_64",
+        "libreoffice-help-nl.x86_64",
+        "libreoffice-help-nn.x86_64",
+        "libreoffice-help-pl.x86_64",
+        "libreoffice-help-pt-BR.x86_64",
+        "libreoffice-help-pt-PT.x86_64",
+        "libreoffice-help-ro.x86_64",
+        "libreoffice-help-ru.x86_64",
+        "libreoffice-help-si.x86_64",
+        "libreoffice-help-sk.x86_64",
+        "libreoffice-help-sl.x86_64",
+        "libreoffice-help-sv.x86_64",
+        "libreoffice-help-ta.x86_64",
+        "libreoffice-help-tr.x86_64",
+        "libreoffice-help-uk.x86_64",
+        "libreoffice-help-zh-Hans.x86_64",
+        "libreoffice-help-zh-Hant.x86_64",
+        "libreoffice-impress.x86_64",
+        "libreoffice-langpack-af.x86_64",
+        "libreoffice-langpack-ar.x86_64",
+        "libreoffice-langpack-as.x86_64",
+        "libreoffice-langpack-bg.x86_64",
+        "libreoffice-langpack-bn.x86_64",
+        "libreoffice-langpack-br.x86_64",
+        "libreoffice-langpack-ca.x86_64",
+        "libreoffice-langpack-cs.x86_64",
+        "libreoffice-langpack-cy.x86_64",
+        "libreoffice-langpack-da.x86_64",
+        "libreoffice-langpack-de.x86_64",
+        "libreoffice-langpack-dz.x86_64",
+        "libreoffice-langpack-el.x86_64",
+        "libreoffice-langpack-en.x86_64",
+        "libreoffice-langpack-eo.x86_64",
+        "libreoffice-langpack-es.x86_64",
+        "libreoffice-langpack-et.x86_64",
+        "libreoffice-langpack-eu.x86_64",
+        "libreoffice-langpack-fa.x86_64",
+        "libreoffice-langpack-fi.x86_64",
+        "libreoffice-langpack-fr.x86_64",
+        "libreoffice-langpack-fy.x86_64",
+        "libreoffice-langpack-ga.x86_64",
+        "libreoffice-langpack-gl.x86_64",
+        "libreoffice-langpack-gu.x86_64",
+        "libreoffice-langpack-he.x86_64",
+        "libreoffice-langpack-hi.x86_64",
+        "libreoffice-langpack-hr.x86_64",
+        "libreoffice-langpack-hu.x86_64",
+        "libreoffice-langpack-id.x86_64",
+        "libreoffice-langpack-it.x86_64",
+        "libreoffice-langpack-ja.x86_64",
+        "libreoffice-langpack-kk.x86_64",
+        "libreoffice-langpack-kn.x86_64",
+        "libreoffice-langpack-ko.x86_64",
+        "libreoffice-langpack-lt.x86_64",
+        "libreoffice-langpack-lv.x86_64",
+        "libreoffice-langpack-mai.x86_64",
+        "libreoffice-langpack-ml.x86_64",
+        "libreoffice-langpack-mr.x86_64",
+        "libreoffice-langpack-nb.x86_64",
+        "libreoffice-langpack-nl.x86_64",
+        "libreoffice-langpack-nn.x86_64",
+        "libreoffice-langpack-nr.x86_64",
+        "libreoffice-langpack-nso.x86_64",
+        "libreoffice-langpack-or.x86_64",
+        "libreoffice-langpack-pa.x86_64",
+        "libreoffice-langpack-pl.x86_64",
+        "libreoffice-langpack-pt-BR.x86_64",
+        "libreoffice-langpack-pt-PT.x86_64",
+        "libreoffice-langpack-ro.x86_64",
+        "libreoffice-langpack-ru.x86_64",
+        "libreoffice-langpack-si.x86_64",
+        "libreoffice-langpack-sk.x86_64",
+        "libreoffice-langpack-sl.x86_64",
+        "libreoffice-langpack-sr.x86_64",
+        "libreoffice-langpack-ss.x86_64",
+        "libreoffice-langpack-st.x86_64",
+        "libreoffice-langpack-sv.x86_64",
+        "libreoffice-langpack-ta.x86_64",
+        "libreoffice-langpack-te.x86_64",
+        "libreoffice-langpack-th.x86_64",
+        "libreoffice-langpack-tn.x86_64",
+        "libreoffice-langpack-tr.x86_64",
+        "libreoffice-langpack-ts.x86_64",
+        "libreoffice-langpack-uk.x86_64",
+        "libreoffice-langpack-ve.x86_64",
+        "libreoffice-langpack-xh.x86_64",
+        "libreoffice-langpack-zh-Hans.x86_64",
+        "libreoffice-langpack-zh-Hant.x86_64",
+        "libreoffice-langpack-zu.x86_64",
+        "libreoffice-math.x86_64",
+        "libreoffice-ogltrans.x86_64",
         "libreoffice-opensymbol-fonts.noarch",
-        "libreoffice-pdfimport.aarch64",
+        "libreoffice-pdfimport.x86_64",
-        "libreoffice-pyuno.aarch64",
+        "libreoffice-pyuno.x86_64",
-        "libreoffice-ure.aarch64",
         "libreoffice-ure-common.noarch",
-        "libreoffice-writer.aarch64",
+        "libreoffice-ure.x86_64",
-        "libreoffice-debuginfo.aarch64",
+        "libreoffice-wiki-publisher.x86_64",
-        "libreoffice-debugsource.aarch64",
+        "libreoffice-writer.x86_64",
-        "libreoffice-graphicfilter-debuginfo.aarch64",
+        "libreoffice-x11.x86_64",
-        "libreoffice-ogltrans-debuginfo.aarch64",
+        "libreoffice-xsltfilter.x86_64",
-        "libreoffice-calc-debuginfo.aarch64",
+        "libreofficekit.x86_64"
-        "libreoffice-core-debuginfo.aarch64",
+      ],
-        "libreoffice-impress-debuginfo.aarch64",
+      "libreoffice-voikko": [
-        "libreoffice-pdfimport-debuginfo.aarch64",
+        "libreoffice-voikko.x86_64"
-        "libreoffice-pyuno-debuginfo.aarch64",
-        "libreoffice-ure-debuginfo.aarch64",
-        "libreoffice-writer-debuginfo.aarch64"
       ],
       "libreport": [
         "libreport.aarch64",
@@ -14652,6 +14770,10 @@
       "librelp": [
         "librelp-devel.aarch64"
       ],
+      "libreoffice": [
+        "libreoffice-sdk-doc.x86_64",
+        "libreoffice-sdk.x86_64"
+      ],
       "librepo": [
         "librepo-devel.aarch64"
       ],
@@ -18911,149 +19033,13 @@
         "librelp.aarch64"
       ],
       "libreoffice": [
-        "libreoffice-base-debuginfo.aarch64",
-        "libreoffice-glade-debuginfo.aarch64",
-        "libreoffice-gtk3-debuginfo.aarch64",
-        "libreofficekit-debuginfo.aarch64",
-        "libreoffice-officebean-debuginfo.aarch64",
-        "libreoffice-postgresql-debuginfo.aarch64",
-        "libreoffice-sdk-debuginfo.aarch64",
-        "libreoffice-x11-debuginfo.aarch64",
-        "libreoffice.aarch64",
-        "libreoffice-base.aarch64",
-        "libreoffice-draw.aarch64",
-        "libreoffice-emailmerge.aarch64",
-        "libreoffice-filters.aarch64",
-        "libreoffice-gdb-debug-support.aarch64",
-        "libreoffice-glade.aarch64",
-        "libreoffice-gtk3.aarch64",
-        "libreoffice-help-ar.aarch64",
-        "libreoffice-help-bg.aarch64",
-        "libreoffice-help-bn.aarch64",
-        "libreoffice-help-ca.aarch64",
-        "libreoffice-help-cs.aarch64",
-        "libreoffice-help-da.aarch64",
-        "libreoffice-help-de.aarch64",
-        "libreoffice-help-dz.aarch64",
-        "libreoffice-help-el.aarch64",
-        "libreoffice-help-eo.aarch64",
-        "libreoffice-help-es.aarch64",
-        "libreoffice-help-et.aarch64",
-        "libreoffice-help-eu.aarch64",
-        "libreoffice-help-fi.aarch64",
-        "libreoffice-help-fr.aarch64",
-        "libreoffice-help-gl.aarch64",
-        "libreoffice-help-gu.aarch64",
-        "libreoffice-help-he.aarch64",
-        "libreoffice-help-hi.aarch64",
-        "libreoffice-help-hr.aarch64",
-        "libreoffice-help-hu.aarch64",
-        "libreoffice-help-id.aarch64",
-        "libreoffice-help-it.aarch64",
-        "libreoffice-help-ja.aarch64",
-        "libreoffice-help-ko.aarch64",
-        "libreoffice-help-lt.aarch64",
-        "libreoffice-help-lv.aarch64",
-        "libreoffice-help-nb.aarch64",
-        "libreoffice-help-nl.aarch64",
-        "libreoffice-help-nn.aarch64",
-        "libreoffice-help-pl.aarch64",
-        "libreoffice-help-pt-BR.aarch64",
-        "libreoffice-help-pt-PT.aarch64",
-        "libreoffice-help-ro.aarch64",
-        "libreoffice-help-ru.aarch64",
-        "libreoffice-help-si.aarch64",
-        "libreoffice-help-sk.aarch64",
-        "libreoffice-help-sl.aarch64",
-        "libreoffice-help-sv.aarch64",
-        "libreoffice-help-ta.aarch64",
-        "libreoffice-help-tr.aarch64",
-        "libreoffice-help-uk.aarch64",
-        "libreoffice-help-zh-Hans.aarch64",
-        "libreoffice-help-zh-Hant.aarch64",
-        "libreofficekit.aarch64",
-        "libreofficekit-devel.aarch64",
-        "libreoffice-langpack-af.aarch64",
-        "libreoffice-langpack-ar.aarch64",
-        "libreoffice-langpack-as.aarch64",
-        "libreoffice-langpack-bg.aarch64",
-        "libreoffice-langpack-bn.aarch64",
-        "libreoffice-langpack-br.aarch64",
-        "libreoffice-langpack-ca.aarch64",
-        "libreoffice-langpack-cs.aarch64",
-        "libreoffice-langpack-cy.aarch64",
-        "libreoffice-langpack-da.aarch64",
-        "libreoffice-langpack-de.aarch64",
-        "libreoffice-langpack-dz.aarch64",
-        "libreoffice-langpack-el.aarch64",
-        "libreoffice-langpack-eo.aarch64",
-        "libreoffice-langpack-es.aarch64",
-        "libreoffice-langpack-et.aarch64",
-        "libreoffice-langpack-eu.aarch64",
-        "libreoffice-langpack-fa.aarch64",
-        "libreoffice-langpack-fi.aarch64",
-        "libreoffice-langpack-fr.aarch64",
-        "libreoffice-langpack-fy.aarch64",
-        "libreoffice-langpack-ga.aarch64",
-        "libreoffice-langpack-gl.aarch64",
-        "libreoffice-langpack-gu.aarch64",
-        "libreoffice-langpack-he.aarch64",
-        "libreoffice-langpack-hi.aarch64",
-        "libreoffice-langpack-hr.aarch64",
-        "libreoffice-langpack-hu.aarch64",
-        "libreoffice-langpack-id.aarch64",
-        "libreoffice-langpack-it.aarch64",
-        "libreoffice-langpack-ja.aarch64",
-        "libreoffice-langpack-kk.aarch64",
-        "libreoffice-langpack-kn.aarch64",
-        "libreoffice-langpack-ko.aarch64",
-        "libreoffice-langpack-lt.aarch64",
-        "libreoffice-langpack-lv.aarch64",
-        "libreoffice-langpack-mai.aarch64",
-        "libreoffice-langpack-ml.aarch64",
-        "libreoffice-langpack-mr.aarch64",
-        "libreoffice-langpack-nb.aarch64",
-        "libreoffice-langpack-nl.aarch64",
-        "libreoffice-langpack-nn.aarch64",
-        "libreoffice-langpack-nr.aarch64",
-        "libreoffice-langpack-nso.aarch64",
-        "libreoffice-langpack-or.aarch64",
-        "libreoffice-langpack-pa.aarch64",
-        "libreoffice-langpack-pl.aarch64",
-        "libreoffice-langpack-pt-BR.aarch64",
-        "libreoffice-langpack-pt-PT.aarch64",
-        "libreoffice-langpack-ro.aarch64",
-        "libreoffice-langpack-ru.aarch64",
-        "libreoffice-langpack-si.aarch64",
-        "libreoffice-langpack-sk.aarch64",
-        "libreoffice-langpack-sl.aarch64",
-        "libreoffice-langpack-sr.aarch64",
-        "libreoffice-langpack-ss.aarch64",
-        "libreoffice-langpack-st.aarch64",
-        "libreoffice-langpack-sv.aarch64",
-        "libreoffice-langpack-ta.aarch64",
-        "libreoffice-langpack-te.aarch64",
-        "libreoffice-langpack-th.aarch64",
-        "libreoffice-langpack-tn.aarch64",
-        "libreoffice-langpack-tr.aarch64",
-        "libreoffice-langpack-ts.aarch64",
-        "libreoffice-langpack-uk.aarch64",
-        "libreoffice-langpack-ve.aarch64",
-        "libreoffice-langpack-xh.aarch64",
-        "libreoffice-langpack-zh-Hans.aarch64",
-        "libreoffice-langpack-zh-Hant.aarch64",
-        "libreoffice-langpack-zu.aarch64",
-        "libreoffice-librelogo.aarch64",
-        "libreoffice-math.aarch64",
-        "libreoffice-nlpsolver.aarch64",
-        "libreoffice-officebean.aarch64",
         "libreoffice-officebean-common.noarch",
-        "libreoffice-postgresql.aarch64",
+        "libreofficekit-devel.x86_64",
-        "libreoffice-sdk.aarch64",
+        "libreoffice-glade.x86_64",
-        "libreoffice-sdk-doc.aarch64",
+        "libreoffice-librelogo.x86_64",
-        "libreoffice-wiki-publisher.aarch64",
+        "libreoffice-nlpsolver.x86_64",
-        "libreoffice-x11.aarch64",
+        "libreoffice-officebean.x86_64",
-        "libreoffice-xsltfilter.aarch64"
+        "libreoffice-postgresql.x86_64"
       ],
       "libreport": [
         "libreport-newt-debuginfo.aarch64",

variants-aarch64.xml

@@ -72,6 +72,7 @@
       <group default="false">file-server</group>
       <group default="false">fonts</group>
       <group default="false">ftp-server</group>
+      <group default="false">gnome-apps</group>
       <group default="false">gnome-desktop</group>
       <group default="false">graphical-admin-tools</group>
       <group default="false">graphics</group>
@@ -92,6 +93,7 @@
       <group default="false">network-server</group>
       <group default="false">network-tools</group>
       <group default="false">networkmanager-submodules</group>
+      <group default="false">office-suite</group>
       <group default="false">ostree-support</group>
       <group default="false">performance</group>
       <group default="false">platform-devel</group>
@@ -278,14 +280,9 @@
       <arch>aarch64</arch>
     </arches>
     <groups>
-      <group default="false">gnome-apps</group>
+      <group default="false">additional-devel</group>
-      <group default="false">office-suite</group>
       <group default="false">platform-vmware</group>
     </groups>
-    <environments>
-      <environment display_order="99">virtualization-host-environment</environment>
-      <environment display_order="4">workstation-product-environment</environment>
-    </environments>
     <modules>
       <module>javapackages-tools-devel:202201</module>
       <module>javapackages-tools:202201</module>