From 898eb462c8cd3c4c4aea6016b95a52c2f8b965f0 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 8 Nov 2024 16:34:44 +0300 Subject: [PATCH 1/2] Added Libreoffice to AppStream again --- prepopulate-aarch64.json | 314 +++++++++++++++++++-------------------- 1 file changed, 150 insertions(+), 164 deletions(-) diff --git a/prepopulate-aarch64.json b/prepopulate-aarch64.json index 0b041ce..1c6ae15 100644 --- a/prepopulate-aarch64.json +++ b/prepopulate-aarch64.json @@ -5040,31 +5040,149 @@ "autocorr-vi.noarch", "autocorr-vro.noarch", "autocorr-zh.noarch", - "libreoffice-calc.aarch64", - "libreoffice-core.aarch64", + "libreoffice.x86_64", + "libreoffice-base.x86_64", + "libreoffice-calc.x86_64", + "libreoffice-core.x86_64", "libreoffice-data.noarch", - "libreoffice-graphicfilter.aarch64", - "libreoffice-help-en.aarch64", - "libreoffice-impress.aarch64", - "libreoffice-langpack-en.aarch64", - "libreoffice-ogltrans.aarch64", + "libreoffice-draw.x86_64", + "libreoffice-emailmerge.x86_64", + "libreoffice-filters.x86_64", + "libreoffice-gdb-debug-support.x86_64", + "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-pyuno.aarch64", - "libreoffice-ure.aarch64", + "libreoffice-pdfimport.x86_64", + "libreoffice-pyuno.x86_64", "libreoffice-ure-common.noarch", - "libreoffice-writer.aarch64", - "libreoffice-debuginfo.aarch64", - "libreoffice-debugsource.aarch64", - "libreoffice-graphicfilter-debuginfo.aarch64", - "libreoffice-ogltrans-debuginfo.aarch64", - "libreoffice-calc-debuginfo.aarch64", - "libreoffice-core-debuginfo.aarch64", - "libreoffice-impress-debuginfo.aarch64", - "libreoffice-pdfimport-debuginfo.aarch64", - "libreoffice-pyuno-debuginfo.aarch64", - "libreoffice-ure-debuginfo.aarch64", - "libreoffice-writer-debuginfo.aarch64" + "libreoffice-ure.x86_64", + "libreoffice-wiki-publisher.x86_64", + "libreoffice-writer.x86_64", + "libreoffice-x11.x86_64", + "libreoffice-xsltfilter.x86_64", + "libreofficekit.x86_64" + ], + "libreoffice-voikko": [ + "libreoffice-voikko.x86_64" ], "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", - "libreoffice-sdk.aarch64", - "libreoffice-sdk-doc.aarch64", - "libreoffice-wiki-publisher.aarch64", - "libreoffice-x11.aarch64", - "libreoffice-xsltfilter.aarch64" + "libreofficekit-devel.x86_64", + "libreoffice-glade.x86_64", + "libreoffice-librelogo.x86_64", + "libreoffice-nlpsolver.x86_64", + "libreoffice-officebean.x86_64", + "libreoffice-postgresql.x86_64" ], "libreport": [ "libreport-newt-debuginfo.aarch64", From f5eb99f3adb7bd427068ab1a3e90bbeb5a433756 Mon Sep 17 00:00:00 2001 From: tigro Date: Fri, 8 Nov 2024 16:34:47 +0300 Subject: [PATCH 2/2] Revert "- Drop cheese" This reverts commit a5a5fcd582730f082521b56e74ac4877a976affe. --- comps-aarch64.xml | 84 +++++++++++--------------------------------- variants-aarch64.xml | 9 ++--- 2 files changed, 23 insertions(+), 70 deletions(-) diff --git a/comps-aarch64.xml b/comps-aarch64.xml index 68640e8..c5a9c1a 100644 --- a/comps-aarch64.xml +++ b/comps-aarch64.xml @@ -5949,7 +5949,7 @@ vsftpd - + gnome-apps GNOME Applications GNOME এপ্লিকেচনসমূহ @@ -6007,8 +6007,8 @@ false false - brasero - brasero-nautilus + brasero + brasero-nautilus @@ -6175,6 +6175,7 @@ at-spi2-core avahi-tools baobab + cheese chrome-gnome-shell dconf eog @@ -6439,6 +6440,7 @@ avahi-tools baobab celluloid + cheese chrome-gnome-shell dconf eog @@ -11567,7 +11569,7 @@ NetworkManager-wwan - + office-suite Office Suite and Productivity কাৰ্যালয় গোট আৰু কাৰ্য্যক্ষমতা @@ -11632,17 +11634,17 @@ false false - libreoffice-calc - libreoffice-draw - libreoffice-emailmerge - libreoffice-graphicfilter - libreoffice-impress - libreoffice-math - libreoffice-writer - libreoffice-base - libreoffice-ogltrans - libreoffice-pyuno - libreoffice-wiki-publisher + libreoffice-calc + libreoffice-draw + libreoffice-emailmerge + libreoffice-graphicfilter + libreoffice-impress + libreoffice-math + libreoffice-writer + libreoffice-base + libreoffice-ogltrans + libreoffice-pyuno + libreoffice-wiki-publisher @@ -17501,60 +17503,12 @@ standard workstation-product - - backup-client - headless-management - internet-applications - internet-browser-firefox - remote-desktop-clients - smart-card - - - - workstation-product-environment - Workstation - Arbeitsplatz - Estación de trabajo - Station de travail - Postazione di lavoro - ワークステーション - 워크스테이션 - Workstation - Рабочая станция - 工作站 - 工作站 - Workstation is a user-friendly desktop system for laptops and PCs. - Workstation ist ein benutzerfreundliches Desktop-System für Laptops und PCs. - Workstation es un sistema de escritorio fácil de usar para ordenadores portátiles y PC. - Une station de travail est un système de bureau convivial pour les ordinateurs portables et les PC. - Workstation è un sistema desktop di facile utilizzo per computer portatili e PC. - ノートパソコンおよび PC 向けのユーザーフレンドリーなデスクト>ップシステムです。 - 워크스테이션은 사용자 친화적인 랩탑 및 PC 용 데스크탑 시스템>입니다. - Workstation é um sistema de desktop amigável para laptops e PCs. - Workstation é um sistema de desktop amigável para laptops e PCs. - Рабочая станция - это удобная для пользователя настольная система для ноутбуков и ПК. - 工作站是用户友好的笔记本电脑和 PC 的桌面系统。 - Workstation是一款面向筆記本電腦和PC的用戶友好型桌面系統。 - 4 - - base-x - core - fonts - gnome-desktop - guest-desktop-agents - hardware-support - internet-browser - multimedia - networkmanager-submodules - print-client - standard - workstation-product - backup-client gnome-apps headless-management internet-applications + internet-browser-firefox office-suite remote-desktop-clients smart-card @@ -18203,8 +18157,10 @@ 80 emacs + gnome-apps graphics internet-applications + office-suite diff --git a/variants-aarch64.xml b/variants-aarch64.xml index e827cda..96df0a6 100644 --- a/variants-aarch64.xml +++ b/variants-aarch64.xml @@ -72,6 +72,7 @@ file-server fonts ftp-server + gnome-apps gnome-desktop graphical-admin-tools graphics @@ -92,6 +93,7 @@ network-server network-tools networkmanager-submodules + office-suite ostree-support performance platform-devel @@ -278,14 +280,9 @@ aarch64 - gnome-apps - office-suite + additional-devel platform-vmware - - virtualization-host-environment - workstation-product-environment - javapackages-tools-devel:202201 javapackages-tools:202201