From 26337b5d8da8d4a8099d2dbba78a514c2bafe2c8 Mon Sep 17 00:00:00 2001
From: Vitaly Lipatov <lav@etersoft.ru>
Date: Fri, 5 May 2023 01:28:12 +0300
Subject: [PATCH] epm repack: use --no-remove for install
---
repack.d/common.sh | 2 +-
repack.d/vk-calls.sh | 3 ++-
repack.d/yandex-browser-beta.sh | 2 +-
repack.d/yandex-browser-stable.sh | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/repack.d/common.sh b/repack.d/common.sh
index 7532fcda..75380901 100755
--- a/repack.d/common.sh
+++ b/repack.d/common.sh
@@ -281,7 +281,7 @@ install_requires()
{
[ -n "$1" ] || return
if [ "$(epm print info -s)" = "alt" ] ; then
- epm install --skip-installed "$@"
+ epm install --skip-installed --no-remove "$@" || fatal "Can't install requires packages."
fi
}
diff --git a/repack.d/vk-calls.sh b/repack.d/vk-calls.sh
index 6db18d37..920e5c4c 100755
--- a/repack.d/vk-calls.sh
+++ b/repack.d/vk-calls.sh
@@ -22,7 +22,8 @@ for i in .$PRODUCTDIR/lib* .$PRODUCTDIR/$PRODUCT ; do
done
fi
-epm install --skip-installed libmfx || epm install 316139 || fatal "Can't install libmfx"
+# https://git.altlinux.org/tasks/316139
+epm install --skip-installed --no-remove libmfx || epm install --no-remove 316139 || fatal "Can't install libmfx"
# if not Debian based
if [ ! -s /etc/ssl/certs/ca-certificates.crt ] ; then
diff --git a/repack.d/yandex-browser-beta.sh b/repack.d/yandex-browser-beta.sh
index 4d3e2dd3..6302f030 100755
--- a/repack.d/yandex-browser-beta.sh
+++ b/repack.d/yandex-browser-beta.sh
@@ -16,7 +16,7 @@ subst '10iProvides: yandex-browser = %{version}' $SPEC
add_findreq_skiplist $PRODUCTDIR/update-ffmpeg
# this package can be missed
-epm install --skip-installed fonts-ttf-google-noto-emoji-color && add_requires fonts-ttf-google-noto-emoji-color
+epm install --skip-installed --no-remove fonts-ttf-google-noto-emoji-color && add_requires fonts-ttf-google-noto-emoji-color
set_alt_alternatives 65
diff --git a/repack.d/yandex-browser-stable.sh b/repack.d/yandex-browser-stable.sh
index 2e5c6524..f8f3dc3b 100755
--- a/repack.d/yandex-browser-stable.sh
+++ b/repack.d/yandex-browser-stable.sh
@@ -16,7 +16,7 @@ subst '10iProvides: yandex-browser = %version' $SPEC
add_findreq_skiplist $PRODUCTDIR/update-ffmpeg
# this package can be missed
-epm install --skip-installed fonts-ttf-google-noto-emoji-color && add_requires fonts-ttf-google-noto-emoji-color
+epm install --skip-installed --no-remove fonts-ttf-google-noto-emoji-color && add_requires fonts-ttf-google-noto-emoji-color
set_alt_alternatives 65
--
2.24.1