From 5581dc91ec6f3330c338995d1cdfbca285298011 Mon Sep 17 00:00:00 2001
From: Mikhail Efremov <sem@altlinux.org>
Date: Tue, 26 Oct 2021 18:21:23 +0300
Subject: [PATCH] workstation: Use libreoffice-latest list on armh

There is no LibreOffice-still on armh now, so use
separate libreoffice-latest list for LibreOffice.
---
 conf.d/basealt.mk                           |  4 ++++
 conf.d/mixin-basealt.mk                     |  2 ++
 pkg.in/lists/workstation/libreoffice-latest | 12 ++++++++++++
 3 files changed, 18 insertions(+)
 create mode 100644 pkg.in/lists/workstation/libreoffice-latest

diff --git a/conf.d/basealt.mk b/conf.d/basealt.mk
index d56aeb45..086a840b 100644
--- a/conf.d/basealt.mk
+++ b/conf.d/basealt.mk
@@ -57,7 +57,11 @@ vm/.alt-workstation: vm/systemd use/x11/lightdm/gtk \
 	@$(call add,THE_PACKAGES,installer-feature-lightdm-stage3)
 	@$(call add,THE_PACKAGES,installer-feature-quota-stage2)
 	@$(call add,THE_PACKAGES,alterator-gpupdate)
+ifeq (,$(filter-out armh,$(ARCH)))
+	@$(call add,THE_LISTS,workstation/libreoffice-latest)
+else
 	@$(call add,THE_LISTS,workstation/libreoffice)
+endif
 
 vm/alt-workstation:: vm/.alt-workstation
 ifeq (,$(filter-out i586 x86_64,$(ARCH)))
diff --git a/conf.d/mixin-basealt.mk b/conf.d/mixin-basealt.mk
index d97b91a3..a9f71b2f 100644
--- a/conf.d/mixin-basealt.mk
+++ b/conf.d/mixin-basealt.mk
@@ -30,7 +30,9 @@ mixin/alt-workstation: +systemd +systemd-optimal +pulse +nm +power \
 	@$(call add,BASE_LISTS,$(call tags,desktop cups))
 	@$(call add,LIVE_LISTS,workstation/live.pkgs)
 	@$(call add,LIVE_LISTS,$(call tags,desktop sane))
+ifneq (,$(filter-out armh,$(ARCH)))
 	@$(call add,LIVE_LISTS,$(call tags,desktop office))
+endif
 	@$(call add,THE_LISTS,workstation/mate)
 	@$(call add,THE_LISTS,workstation/the.pkgs)
 	@$(call add,THE_LISTS,$(call tags,regular desktop))
diff --git a/pkg.in/lists/workstation/libreoffice-latest b/pkg.in/lists/workstation/libreoffice-latest
new file mode 100644
index 00000000..e2595207
--- /dev/null
+++ b/pkg.in/lists/workstation/libreoffice-latest
@@ -0,0 +1,12 @@
+LibreOffice
+LibreOffice-langpack-ru
+LibreOffice-gtk3
+LibreOffice-common
+
+java-1.8.0-openjdk@!mipsel
+libreoffice-languagetool@!mipsel
+libcmis
+libwps
+
+projectlibre@!mipsel
+dia