epm repack: use PREINSTALL_PACKAGES install way

repack.d/portproton-remastered.sh

@@ -6,6 +6,8 @@ SPEC="$2"
 PRODUCT=portproton
 PRODUCTDIR=/opt/PortProton
 
+PREINSTALL_PACKAGES="vulkan-tools"
+
 . $(dirname $0)/common.sh
 
 move_to_opt /PortWINE-master
@@ -37,7 +39,6 @@ pack_file /usr/share/applications/$PRODUCT.desktop
 subst 's|elif|else|' $BUILDROOT$PRODUCTDIR/data_from_portwine/scripts/portwine_db/WorldOfTanksEnCoreLauncher
 
 add_requires bubblewrap cabextract curl gamemode icoutils libvulkan1 vulkan-tools wget zenity zstd libd3d libMesaOpenCL
-epm install --skip-installed vulkan-tools
 
 filter_from_requires xneur
 

repack.d/rustdesk.sh

@@ -60,18 +60,13 @@ fi
 
 [ "$(epm print info -s)" = "alt" ] || exit 0
 
-epm install --skip-installed glib2 libappindicator-gtk3 libcairo libgdk-pixbuf libgtk+3 libpango libpulseaudio libuuid libX11 libXau libxcb libXdmcp libXfixes libXtst xdotool
+install_requires glib2 libappindicator-gtk3 libcairo libgdk-pixbuf libgtk+3 libpango libpulseaudio libuuid libX11 libXau libxcb libXdmcp libXfixes libXtst xdotool
 
-if ! epm install --skip-installed  python3-module-pynput ; then
+if ! epm install --skip-installed --no-remove python3-module-pynput ; then
     case "$(epm print info -e)" in
-        ALTLinux/p10|ALTServer/10)
-            epm install 316569
-            ;;
         ALTLinux/p9)
-            epm install 316570
-            ;;
-        ALTLinux/c9f2)
-            epm install 316739
+            # https://git.altlinux.org/tasks/316570/
+            epm install --no-remove 316570
             ;;
    esac
 fi

repack.d/sbb.sh

@@ -3,16 +3,16 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+REQUIRES="libcurl-gnutls-compat postgresql"
+PREINSTALL_PACKAGES="libcurl libsqlite3 libX11 libxml2 zlib $REQUIRES"
+
+. $(dirname $0)/common.sh
+
 # ошибка: Неудовлетворенные зависимости:
 #    libcurl.so.4(CURL_OPENSSL_3)(64bit) нужен для sbb-02.008.02-alt1.repacked.with.epm.20.x86_64
 
 subst '1i%filter_from_requires /^libcurl.so.4(CURL_OPENSSL_.*/d' $SPEC
 subst '1i%filter_from_requires /^libcurl-gnutls.so.4(CURL_GNUTLS_.*/d' $SPEC
 
-REQUIRES="libcurl-gnutls-compat postgresql"
-subst "1iRequires:$REQUIRES" $SPEC
+add_requires $REQUIRES
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # install all requires packages before packing (the list have got with rpmreqs anydesk)
-    epm install --skip-installed libcurl libsqlite3 libX11 libxml2 zlib $REQUIRES
-fi

repack.d/sbis-libstdc++.sh

@@ -4,6 +4,8 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+. $(dirname $0)/common.sh
+
 LIBPATH="$(cd $BUILDROOT ; echo opt/gcc-*/lib64)"
 
 # find provides there

repack.d/spotify-client.sh

@@ -4,6 +4,10 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+PREINSTALL_PACKAGES="libcurl4-gnutls"
+
+. $(dirname $0)/common.sh
+
 PRODUCT=spotify
 LIBDIR=/opt
 
@@ -26,6 +30,3 @@ for i in 16 22 24 32 48 64 128 256 ; do
     cp $BUILDROOT/$LIBDIR/$PRODUCT/icons/spotify-linux-$i.png $BUILDROOT/usr/share/icons/hicolor/${i}x${i}/apps/spotify-client.png
 done
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed libcurl4-gnutls
-fi
\ No newline at end of file

repack.d/unigine-superposition.sh

@@ -7,6 +7,8 @@ SPEC="$2"
 PRODUCT=unigine-superposition
 PRODUCTDIR=/opt/unigine-superposition
 
+PREINSTALL_PACKAGES="glib2 libdbus libEGL libGL libICE libqt5-test libSM libX11 libxcb libXext libXi libXinerama libXrandr libXrender zlib"
+
 . $(dirname $0)/common.sh
 
 subst "s|^Group:.*|Group: Graphics|" $SPEC
@@ -69,6 +71,3 @@ EOF
 
 pack_file /usr/share/applications/$PRODUCT.desktop
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 libdbus libEGL libGL libICE libqt5-test libSM libX11 libxcb libXext libXi libXinerama libXrandr libXrender zlib
-fi