epm repack: use PREINSTALL_PACKAGES for set needed to install packages

repack.d/1c83-client.sh

@@ -9,6 +9,8 @@ SPEC="$2"
 PRODUCT=1c83-client.sh
 PRODUCTDIR=/opt/1cv8
 
+PREINSTALL_PACKAGES="glib2 libatk libcairo libcairo-gobject libcom_err libcups libenchant libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+3 libharfbuzz-icu libkrb5 libpango libSM libsoup libunwind libX11 libXcomposite libXdamage libXrender libXt"
+
 . $(dirname $0)/common.sh
 
 # installing from tar, so we need fill some fields here
@@ -44,9 +46,3 @@ done
 for i in $BUILDROOT$PRODUCTDIR/common/lib* ; do
     a= patchelf --set-rpath '$ORIGIN' $i
 done
-
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 libatk libcairo libcairo-gobject libcom_err libcups libenchant libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+3 libharfbuzz-icu libkrb5 libpango libSM libsoup libunwind libX11 libXcomposite libXdamage libXrender libXt libXxf86vm
-fi
-
-

repack.d/Autodesk_EAGLE.sh

@@ -7,6 +7,10 @@ SPEC="$2"
 PRODUCT=eagle
 PRODUCTDIR=/opt/$PRODUCT
 
+INSTALL_PACKAGES="coreutils fontconfig glib2 libalsa libcom_err libcups libdrm libexpat libfreetype libGL libkeyutils libkrb5 libnspr libnss libX11 libxcb libXrandr zlib"
+
+. $(dirname $0)/common.sh
+
 #subst '1iAutoProv:no' $SPEC
 
 # move package to /opt
@@ -58,6 +62,4 @@ for i in $BUILDROOT/$PRODUCTDIR/lib/{libssl.so,libssl.so.1.*} ; do
     a= patchelf --set-rpath '$ORIGIN/' $i
 done
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed coreutils fontconfig glib2 libalsa libcom_err libcups libdrm libexpat libfreetype libGL libkeyutils libkrb5 libnspr libnss libX11 libxcb libXrandr zlib
 fi

repack.d/DJV2.sh

@@ -8,6 +8,9 @@ PRODUCT=djv
 PRODUCTCUR=DVJ2
 PRODUCTDIR=/opt/DVJ2
 
+# install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
+PREINSTALL_PACKAGES="libalsa libGLX libOpenGL libX11 libxcb libXext zlib"
+
 . $(dirname $0)/common.sh
 
 move_to_opt /usr/local/DJV2
@@ -35,9 +38,3 @@ for i in $BUILDROOT$PRODUCTDIR/lib/lib*.so* ; do
 done
 
 filter_from_requires libav libswresample libswscale
-
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
-    epm install --skip-installed libalsa libGLX libOpenGL libX11 libxcb libXext zlib
-fi
-

repack.d/SweetHome3D.sh

@@ -8,6 +8,8 @@ PRODUCT=SweetHome3D
 PRODUCTCUR=sweethome3d
 PRODUCTDIR=/opt/$PRODUCT
 
+PREINSTALL_PACKAGES="coreutils glib2 libalsa libatk libcairo libcairo-gobject fontconfig libfreetype libgdk-pixbuf libgio libGL libgtk+2 libgtk+3 libnsl1 libpango libX11 libXext libXi libXrender libXtst"
+
 . $(dirname $0)/common.sh
 
 
@@ -74,6 +76,3 @@ add_findreq_skiplist "$PRODUCTDIR/runtime/lib/amd64/libav*.so"
 
 subst '1iAutoProv:no' $SPEC
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed coreutils glib2 libalsa libatk libcairo libcairo-gobject fontconfig libfreetype libgdk-pixbuf libgio libGL libgtk+2 libgtk+3 libnsl1 libpango libX11 libXext libXi libXrender libXtst
-fi

repack.d/anydesk.sh

@@ -6,6 +6,9 @@ SPEC="$2"
 
 PRODUCT=anydesk
 
+# install all requires packages before packing (the list have got with rpmreqs anydesk)
+PREINSTALL_PACKAGES="fontconfig glib2 libatk libcairo libfreetype libgdk-pixbuf libgio libGL libGLU libgtk+2 libICE libpango libpolkit libSM libX11 libxcb libXdamage libXext libXfixes libXi libxkbfile libXmu libXrandr libXrender libXt libXtst polkit libminizip libgtkglext libpangox1.0-compat"
+
 . $(dirname $0)/common.sh
 
 #mkdir -p $BUILDROOT/etc/systemd/system/
@@ -48,9 +51,3 @@ done
 # preloaded from /usr/lib64/anydesk/, drop external requires
 filter_from_requires libpangox-1.0.so.0 libgdkglext-x11-1.0.so.0 libgtkglext-x11-1.0.so.0
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # install all requires packages before packing (the list have got with rpmreqs anydesk)
-    epm install --skip-installed fontconfig glib2 libatk libcairo libfreetype libgdk-pixbuf libgio libGL libGLU libgtk+2 libICE libpango libpolkit \
-        libSM libX11 libxcb libXdamage libXext libXfixes libXi libxkbfile libXmu libXrandr libXrender libXt libXtst polkit \
-        libminizip libgtkglext libpangox1.0-compat
-fi

repack.d/atom-beta.sh

@@ -14,6 +14,13 @@ for i in atom atom-beta ; do
     subst "1iConflicts:$i" $SPEC
 done
 
+# install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
+PREINSTALL_PACKAGES="coreutils findutils git-core glib2 grep libalsa libatk libat-spi2-core \
+            libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret \
+            libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbfile libXrandr \
+            sed /usr/bin/git /usr/bin/node /usr/bin/npm /usr/bin/npx util-linux which xprop \
+            node python3 rpm-build-python3"
+
 . $(dirname $0)/common-chromium-browser.sh
 
 subst '1iAutoReq:yes,nomonolib,nomono,nopython' $SPEC
@@ -60,12 +67,3 @@ done
 # TODO use separated chromium-sandbox
 # TODO for other distros?
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-# install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
-epm install --skip-installed coreutils findutils git-core glib2 grep libalsa libatk libat-spi2-core \
-            libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret \
-            libX11 libxcb libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbfile libXrandr \
-            sed /usr/bin/git /usr/bin/node /usr/bin/npm /usr/bin/npx util-linux which xprop \
-            node python3 rpm-build-python3
-# enlightenment exo-utils seamonkey
-fi
\ No newline at end of file

repack.d/cascadeur.sh

@@ -36,5 +36,7 @@ EOF
 
 pack_file /usr/share/applications/$PRODUCT.desktop
 
-# just for correct deps
-add_requires qt5-imageformats
+if [ "$(epm print info -s)" = "alt" ] ; then
+    # just for correct deps
+    add_requires qt5-imageformats
+fi

repack.d/chrome-remote-desktop.sh

@@ -4,15 +4,12 @@ BUILDROOT="$1"
 SPEC="$2"
 PRODUCT=chrome-remote-desktop
 
+# install all requires packages before packing ($ rpmreqs chrome-remote-desktop  | xargs echo)
+PREINSTALL_PACKAGES="coreutils glib2 libcairo libdbus libdrm libexpat libgbm libgio libgtk+3 libnspr libnss libpango libX11 libxcb libXdamage libXext libXfixes libXrandr libXtst libutempter \
+     python3-base python3-module-psutil python3 rpm-build-python3"
+
 . $(dirname $0)/common-chromium-browser.sh
 
 cleanup
 
 subst '1iBuildRequires:rpm-build-python3' $SPEC
-
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # install all requires packages before packing ($ rpmreqs chrome-remote-desktop  | xargs echo)
-    epm install --skip-installed coreutils glib2 libcairo libdbus libdrm libexpat libgbm libgio libgtk+3 libnspr libnss libpango libX11 libxcb libXdamage libXext libXfixes libXrandr libXtst libutempter
-    epm install --skip-installed python3-base python3-module-psutil python3 rpm-build-python3
-fi
-

repack.d/cnrdrvcups-ufr2-uk.sh

@@ -4,8 +4,7 @@ BUILDROOT="$1"
 
 SPEC="$2"
 
+PREINSTALL_PACKAGES="glib2 libatk libcairo libcairo-gobject libcups libgdk-pixbuf libgio libgtk+3 libpango libxml2 libjbig"
+
 . $(dirname $0)/common.sh
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 libatk libcairo libcairo-gobject libcups libgdk-pixbuf libgio libgtk+3 libpango libxml2 libjbig
-fi

repack.d/code.sh

@@ -7,6 +7,9 @@ SPEC="$2"
 PRODUCT=code
 PRODUCTDIR=/opt/$PRODUCT
 
+# install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
+PREINSTALL_PACKAGES="at-spi2-atk coreutils findutils gawk glib2 libalsa libatk libat-spi2-core libcairo libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libxkbfile libXrandr libXrender libXScrnSaver libXtst sed"
+
 . $(dirname $0)/common.sh
 
 move_to_opt
@@ -22,7 +25,3 @@ mkdir -p $BUILDROOT/usr/bin/
 ln -rsf $BUILDROOT$PRODUCTDIR/bin/code $BUILDROOT/usr/bin/code
 ln -rs $BUILDROOT$PRODUCTDIR/bin/code $BUILDROOT/usr/bin/vscode
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
-    epm install --skip-installed at-spi2-atk coreutils findutils gawk glib2 libalsa libatk libat-spi2-core libcairo libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libxkbfile libXrandr libXrender libXScrnSaver libXtst sed
-fi

repack.d/codium.sh

@@ -6,6 +6,9 @@ SPEC="$2"
 
 PRODUCT=codium
 
+# install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
+PREINSTALL_PACKAGES="at-spi2-atk coreutils findutils gawk glib2 libalsa libatk libat-spi2-core libcairo libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libxkbfile libXrandr libXrender libXScrnSaver libXtst sed"
+
 . $(dirname $0)/common.sh
 
 move_to_opt
@@ -19,8 +22,3 @@ add_bin_link_command
 fix_desktop_file /usr/share/codium/codium
 
 #fix_chrome_sandbox
-
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # install all requires packages before packing (the list have got with rpmreqs package | xargs echo)
-    epm install --skip-installed at-spi2-atk coreutils findutils gawk glib2 libalsa libatk libat-spi2-core libcairo libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libsecret libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libxkbfile libXrandr libXrender libXScrnSaver libXtst sed
-fi

repack.d/cuda-z.sh

@@ -5,6 +5,11 @@ SPEC="$2"
 
 PRODUCT=cuda-z
 
+# static linked
+# strace -f cuda-z 2>&1 | grep \.so | grep lib64/lib | grep fstat | sed -e 's|.*<||' -e 's|>.*||' | sort -u | epm --quiet --short qf | sort -u | xargs -n100
+# glibc-core glibc-pthread libgcc1 libstdc++6 libX11 libXau libxcb libXcursor libXdmcp libXext libXfixes libXrender
+PREINSTALL_PACKAGES="glibc-core glibc-pthread libgcc1 libstdc++6 libX11 libXau libxcb libXcursor libXdmcp libXext libXfixes libXrender"
+
 . $(dirname $0)/common.sh
 
 subst "s|^Group:.*|Group: Graphics|" $SPEC
@@ -34,9 +39,3 @@ install_file "https://cuda-z.sourceforge.net/img/web-download-detect.png" /usr/s
 # libc6:i386 libstdc++6:i386 zlib1g:i386 libx11-6:i386 libxext6:i386 libxrender1:i386
 # http://blog.redscorp.net/?p=94
 
-# static linked
-# strace -f cuda-z 2>&1 | grep \.so | grep lib64/lib | grep fstat | sed -e 's|.*<||' -e 's|>.*||' | sort -u | epm --quiet --short qf | sort -u | xargs -n100
-# glibc-core glibc-pthread libgcc1 libstdc++6 libX11 libXau libxcb libXcursor libXdmcp libXext libXfixes libXrender
-if [ "$(epm print info -s)" = "alt" ] ; then
-    add_requires glibc-core glibc-pthread libgcc1 libstdc++6 libX11 libXau libxcb libXcursor libXdmcp libXext libXfixes libXrender
-fi

repack.d/duplicati.sh

@@ -4,6 +4,9 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+PREINSTALL_PACKAGES="rpm-build-python3 mono-full libgtk-sharp2"
+
+
 . $(dirname $0)/common.sh
 
 add_requires mono-full libgtk-sharp2
@@ -17,7 +20,3 @@ subst '1iAutoReq: yes,nomonolib,nomono' $SPEC
 subst 's|env python.*|env python3|' $BUILDROOT/usr/lib/duplicati/utility-scripts/DuplicatiVerify.py
 subst 's|/usr/bin/bash|/bin/bash|' $BUILDROOT/usr/lib/duplicati/{lvm-scripts/*.sh,run-script-example.sh} $BUILDROOT/usr/bin/{duplicati-server,duplicati-cli,duplicati}
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed rpm-build-python3 mono-full libgtk-sharp2
-fi
-

repack.d/flashprint5.sh

@@ -4,14 +4,9 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-#PRODUCT=flashprint5
-#PRODUCTDIR=/usr/lib/$PRODUCT
+PREINSTALL_PACKAGES="libGL libGLU libqt5-core libqt5-gui libqt5-network libqt5-opengl libqt5-widgets libudev1"
 
 . $(dirname $0)/common.sh
 
 move_file /usr/lib/libOCCTWrapper.so.1 /usr/lib64/libOCCTWrapper.so.1
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed libGL libGLU libqt5-core libqt5-gui libqt5-network libqt5-opengl libqt5-widgets libudev1
-fi
-

repack.d/geogebra-classic.sh

@@ -7,6 +7,8 @@ SPEC="$2"
 PRODUCT=geogebra-classic
 PRODUCTDIR=/opt/$PRODUCT
 
+PREINSTALL_PACKAGES="python3 rpm-build-python3"
+
 . $(dirname $0)/common-chromium-browser.sh
 
 subst '1iAutoReq:yes,noshell,nomonolib,nomono,nopython' $SPEC
@@ -22,6 +24,3 @@ cleanup
 fix_chrome_sandbox
 
 install_deps
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed python3 rpm-build-python3
-fi

repack.d/icq.sh

@@ -6,6 +6,8 @@ SPEC="$2"
 PRODUCT=icq
 PRODUCTCUR=icq
 
+PREINSTALL_PACKAGES="glib2 libdbus libexpat libgbm libgio libgpg-error libuuid zlib fontconfig libGL"
+
 . $(dirname $0)/common.sh
 
 subst "s|^Group:.*|Group: Networking/Instant messaging|" $SPEC
@@ -72,6 +74,3 @@ for i in QtQuick/*/lib*.so  ; do
     a= patchelf --set-rpath '$ORIGIN/../../lib' $i
 done
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 libdbus libexpat libgbm libgio libgpg-error libuuid zlib fontconfig libGL
-fi

repack.d/iproject-client.sh

@@ -6,6 +6,8 @@ SPEC="$2"
 PRODUCT=iproject-client
 PRODUCTDIR="/opt/iproject-client"
 
+PREINSTALL_PACKAGES="coreutils libgdiplus liblame libnuma libopus libuuid libvorbis mono-core mono-data mono-winforms zlib mono-devel mono-extras mono-mvc mono-web"
+
 . $(dirname $0)/common.sh
 
 mkdir -p $BUILDROOT/usr/bin/
@@ -26,8 +28,3 @@ filter_from_requires "mono(Microsoft.Threading.Tasks.Extensions)"
 filter_from_requires "mono(System.Runtime)"
 filter_from_requires "mono(System.Threading.Tasks)"
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed coreutils libgdiplus liblame libnuma libopus libuuid libvorbis
-    epm install --skip-installed mono-core mono-data mono-winforms zlib
-    # mono-devel mono-extras mono-mvc mono-web
-fi

repack.d/librewolf.sh

@@ -5,6 +5,9 @@ SPEC="$2"
 
 PRODUCT=librewolf
 
+PREINSTALL_PACKAGES="fontconfig glib2 libalsa libatk libcairo libcairo-gobject libdbus libdbus-glib libfreetype libgdk-pixbuf libgio libgtk+3 libharfbuzz libpango libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst"
+
+
 . $(dirname $0)/common.sh
 
 subst '1iAutoReq:yes,noshell,nomonolib,nomono,nopython' $SPEC
@@ -25,6 +28,3 @@ for i in $BUILDROOT/$PRODUCTDIR/gmp-clearkey/0.1/lib*.so ; do
     a= patchelf --set-rpath '$ORIGIN/../../' $i || continue
 done
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm --skip-installed install fontconfig glib2 libalsa libatk libcairo libcairo-gobject libdbus libdbus-glib libfreetype libgdk-pixbuf libgio libgtk+3 libharfbuzz libpango libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst
-fi

repack.d/lunacy.sh

@@ -8,6 +8,8 @@ PRODUCT=lunacy
 PRODUCTCUR=Lunacy
 PRODUCTDIR=/opt/icons8/lunacy
 
+PREINSTALL_PACKAGES="liblttng-ust libX11 fontconfig zlib"
+
 . $(dirname $0)/common.sh
 
 add_bin_link_command $PRODUCTCUR
@@ -20,6 +22,3 @@ install_file /opt/icons8/lunacy/Assets/LunacyLogo.png /usr/share/pixmaps/$PRODUC
 subst '1iAutoProv:no' $SPEC
 subst '1iAutoReq:yes,nomono,nomonolib' $SPEC
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed liblttng-ust libX11 fontconfig zlib
-fi

repack.d/master-pdf-editor.sh

@@ -7,11 +7,10 @@ PRODUCT=masterpdfeditor5
 PRODUCTCUR=master-pdf-editor
 PRODUCTDIR=/opt/master-pdf-editor-5
 
+PREINSTALL_PACKAGES="libGL libqt5-core libqt5-gui libqt5-network libqt5-printsupport libqt5-qml libqt5-svg libqt5-widgets libsane zlib"
+
 . $(dirname $0)/common.sh
 
 add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed libGL libqt5-core libqt5-gui libqt5-network libqt5-printsupport libqt5-qml libqt5-svg libqt5-widgets libsane zlib
-fi

repack.d/minecraft-launcher.sh

@@ -7,4 +7,6 @@ PRODUCT=minecraft-launcher
 
 . $(dirname $0)/common.sh
 
-add_requires java-openjdk at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret
+if [ "$(epm print info -s)" = "alt" ] ; then
+    add_requires java-openjdk at-spi2-atk file GConf glib2 grep libatk libat-spi2-core libalsa libcairo libcups libdbus libdrm libexpat libgbm libgdk-pixbuf libgio libgtk+3 libnspr libnss libpango libX11 libxcb libXcomposite libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender libXtst sed which xdg-utils xprop libsecret
+fi

repack.d/mssql-server.sh

@@ -5,6 +5,8 @@ BUILDROOT="$1"
 SPEC="$2"
 PRODUCTDIR=/opt/mssql
 
+PREINSTALL_PACKAGES="libnuma libsss_nss_idmap bzip2 cyrus-sasl2 libcom_err libkrb5 libldap libsasl2-plugin-gssapi python3 su glibc-utils liblzma"
+
 . $(dirname $0)/common.sh
 
 # we need libssl/libcrypto-devel due libssl.so/libcrypto.so using (ALT bug 35559)
@@ -27,5 +29,3 @@ for i in $BUILDROOT/opt/mssql/lib/libunwind-x86_64.so.8 ; do
     a= patchelf --set-rpath '$ORIGIN/' $i
 done
 
-epm install libnuma libsss_nss_idmap bzip2 cyrus-sasl2 libcom_err libkrb5 libldap libsasl2-plugin-gssapi python3 su glibc-utils liblzma
-# sudo

repack.d/onlyoffice-desktopeditors.sh

@@ -6,6 +6,8 @@ SPEC="$2"
 
 PRODUCTDIR=/opt/onlyoffice
 
+PREINSTALL_PACKAGES="bzlib fontconfig libalsa libcairo libcups libdrm libfreetype zlib libXv glib2 libatk libcairo-gobject libEGL libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+2 libgtk+3 libpango libpulseaudio libsqlite3 libX11 libxcb libxcb-render-util libXcomposite libXext libXfixes libxkbcommon libxkbcommon-x11 libXrender"
+
 . $(dirname $0)/common.sh
 
 # TODO: required libreoffice-opensymbol-fonts
@@ -42,6 +44,3 @@ subst "s|%files|%files\n/usr/share/icons/hicolor/*x*/apps/$iconname.png|" $SPEC
 subst '1iAutoReq:no' $SPEC
 subst '1iAutoProv:no' $SPEC
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed bzlib fontconfig libalsa libcairo libcups libdrm libfreetype zlib libXv glib2 libatk libcairo-gobject libEGL libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+2 libgtk+3 libpango libpulseaudio libsqlite3 libX11 libxcb libxcb-render-util libXcomposite libXext libXfixes libxkbcommon libxkbcommon-x11 libXrender
-fi

repack.d/portproton-remastered.sh

@@ -37,7 +37,7 @@ 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
+epm install --skip-installed vulkan-tools
 
 filter_from_requires xneur
 

repack.d/portproton.sh

@@ -8,6 +8,8 @@ PRODUCTDIR=/opt/PortProton
 
 . $(dirname $0)/common.sh
 
-add_requires bubblewrap cabextract curl gamemode icoutils libvulkan1 vulkan-tools wget zenity zstd gawk tar libd3d libMesaOpenCL /usr/bin/convert
+if [ "$(epm print info -s)" = "alt" ] ; then
+    add_requires bubblewrap cabextract curl gamemode icoutils libvulkan1 vulkan-tools wget zenity zstd gawk tar libd3d libMesaOpenCL /usr/bin/convert
+fi
 
 filter_from_requires xneur

repack.d/rstudio.sh

@@ -7,6 +7,8 @@ SPEC="$2"
 PRODUCT=rstudio
 PRODUCTDIR=/usr/lib/$PRODUCT
 
+PREINSTALL_PACKAGES="libpq5 libsqlite sqlite R-base R-doc-html"
+
 . $(dirname $0)/common.sh
 
 add_bin_exec_command $PRODUCT
@@ -27,6 +29,3 @@ filter_from_requires libQt5 libicu "libpq.so.5(RHPG_9"
 #    rm -v $BUILDROOT/usr/lib/rstudio/resources/app/bin/{diagnostics,rpostback,rsession}
 #fi
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed libpq5 libsqlite sqlite R-base R-doc-html
-fi

repack.d/rudesktop.sh

@@ -4,10 +4,9 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+PREINSTALL_PACKAGES="glib2 libcairo libgdk-pixbuf libgtk+3 libpango libpulseaudio libuuid libX11 libxcb libXfixes libXtst python3 python3-base python3-module-evdev python3-module-six xdotool"
+
 . $(dirname $0)/common.sh
 
 filter_from_requires "python3(AppKit)" "python3(CoreFoundation)" "python3(HIServices)" "python3(Quartz)" "python3(objc)"
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 libcairo libgdk-pixbuf libgtk+3 libpango libpulseaudio libuuid libX11 libxcb libXfixes libXtst python3 python3-base python3-module-evdev python3-module-six xdotool
-fi

repack.d/softmaker-freeoffice-2021.sh

@@ -7,6 +7,8 @@ PRODUCT=freeoffice2021
 PRODUCTDIR=/usr/share/freeoffice2021
 VERSION=free21
 
+PREINSTALL_PACKAGES="coreutils file gawk grep libcurl libGL libX11 libXext libXmu libXrandr libXrender sed xprop"
+
 . $(dirname $0)/common.sh
 
 
@@ -82,7 +84,3 @@ epm tool erc dwr.tar.lzma || fatal
 mv -v dwr.tar/* . || fatal
 remove_file dwr.tar.lzma
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed coreutils file gawk grep libcurl libGL libX11 libXext libXmu libXrandr libXrender sed xprop
-fi
-

repack.d/synology-drive.sh

@@ -6,6 +6,7 @@ SPEC="$2"
 PRODUCT=synology-drive
 PRODUCTDIR=/opt/Synology/SynologyDrive
 
+PREINSTALL_PACKAGES="coreutils glib2 libdbus libgtk+3 libICE libpango libSM libX11 libxcb libxkbcommon libXrender fontconfig libfreetype"
 
 . $(dirname $0)/common.sh
 
@@ -49,6 +50,3 @@ remove_file $PRODUCTDIR/package/cloudstation/icon-overlay/14/lib/plugin-cb.so
 # TODO: parse
 # https://www.synology.com/api/support/findDownloadInfo?lang=ru-ru&product=DS2411%2B&major=6&minor=2
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed coreutils glib2 libdbus libgtk+3 libICE libpango libSM libX11 libxcb libxkbcommon libXrender fontconfig libfreetype
-fi

repack.d/viber.sh

@@ -7,6 +7,8 @@ PRODUCT=Viber
 PRODUCTCUR=viber
 PRODUCTDIR=/opt/viber
 
+PREINSTALL_PACKAGES="glib2 gst-plugins-bad1.0 libalsa libbrotlidec libcups libdbus libdrm libEGL libexpat libfreetype libGL libGLX libgomp1 libgst-plugins1.0 libgstreamer1.0 libharfbuzz libICE libkrb5 liblcms2 libmng libmtdev libnspr libnss libOpenGL libopus libSM libsnappy libtiff5 libts0 libudev1 libwayland-client libwayland-cursor libwayland-egl libwayland-server libwebp7 libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXext libXfixes libxkbcommon libxkbcommon-x11 libxkbfile libxml2 libXrandr libXScrnSaver libxshmfence libxslt libXtst libzstd zlib fontconfig"
+
 . $(dirname $0)/common.sh
 
 add_bin_link_command
@@ -15,8 +17,3 @@ add_bin_link_command $PRODUCTCUR $PRODUCT
 subst '1i%filter_from_requires /^libtiff.so.5(LIBTIFF_.*/d' $SPEC
 
 fix_desktop_file
-
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 gst-plugins-bad1.0 libalsa libbrotlidec libcups libdbus libdrm libEGL libexpat libfreetype libGL libGLX libgomp1 libgst-plugins1.0 libgstreamer1.0 libharfbuzz libICE libkrb5 liblcms2 libmng libmtdev libnspr libnss libOpenGL libopus libSM libsnappy libtiff5 libts0 libudev1 libwayland-client libwayland-cursor libwayland-egl libwayland-server libwebp7 libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXext libXfixes libxkbcommon libxkbcommon-x11 libxkbfile libxml2 libXrandr libXScrnSaver libxshmfence libxslt libXtst libzstd zlib fontconfig
-    # seamonkey thunderbird
-fi

repack.d/vinteo.desktop.sh

@@ -23,6 +23,8 @@ case "$(epm print info -e)" in
     ALTLinux/p9)
         # bindings.node: /lib64/libc.so.6: version `GLIBC_2.28' not found
         echo "TODO: build node-serialport package if needed"
-        remove_dir $PRODUCTDIR/resources/app.asar.unpacked/node_modules/@serialport
+        remove_dir $PRODUCTDIR/resources/app.asar.unpacked/node_modules/@serialport/bindings-cpp/prebuilds/
+        remove_dir $PRODUCTDIR/resources/app.asar.unpacked/node_modules/@serialport/bindings-cpp/build/
+        remove_dir $PRODUCTDIR/resources/app.asar.unpacked/node_modules/@serialport/bindings-cpp/bin/
         ;;
 esac

repack.d/vkteams.sh

@@ -5,6 +5,8 @@ SPEC="$2"
 
 PRODUCT=vkteams
 
+PREINSTALL_PACKAGES="glib2 libdbus libexpat libgbm libgio libgpg-error libuuid zlib fontconfig libGL libalsa libnspr libnss"
+
 . $(dirname $0)/common.sh
 
 subst "s|^Group:.*|Group: Networking/Instant messaging|" $SPEC
@@ -74,6 +76,3 @@ done
 # FIXME: check the full list
 filter_from_requires libQt5 libxcb "libX.*"
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm install --skip-installed glib2 libdbus libexpat libgbm libgio libgpg-error libuuid zlib fontconfig libGL libalsa libnspr libnss
-fi

repack.d/xnview.sh

@@ -3,6 +3,8 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+PREINSTALL_PACKAGES="libQt5MultimediaGstTools libQt5WaylandClient libqt5-multimedia libqt5-waylandclient fontconfig glib2 libalsa libatk libcairo libcairo-gobject libcups libdbus libdrm libEGL libexpat libfreetype libgbm libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+2 libgtk+3 libkrb5 liblzma libnspr libnss libpango libpulseaudio libwayland-client libwayland-cursor libwayland-egl libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbcommon-x11 libXrandr libXrender libXtst perl-base zlib"
+
 . $(dirname $0)/common.sh
 
 #ln -s /lib64/libbz2.so.1 $BUILDROOT/opt/XnView/lib/libbz2.so.1.0
@@ -26,10 +28,3 @@ for i in $BUILDROOT/opt/XnView/XnView ; do
     a= patchelf --set-rpath '$ORIGIN/lib/' $i || continue
 done
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    # FIXME: missed in the package
-    #filter_from_requires libQt5MultimediaGstTools libQt5WaylandClient
-    epm install --skip-installed libqt5-multimedia libqt5-waylandclient
-
-    epm install --skip-installed fontconfig glib2 libalsa libatk libcairo libcairo-gobject libcups libdbus libdrm libEGL libexpat libfreetype libgbm libgdk-pixbuf libgio libGL libgst-plugins1.0 libgstreamer1.0 libgtk+2 libgtk+3 libkrb5 liblzma libnspr libnss libpango libpulseaudio libwayland-client libwayland-cursor libwayland-egl libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbcommon-x11 libXrandr libXrender libXtst perl-base zlib
-fi

repack.d/zoom.sh

@@ -6,6 +6,8 @@ SPEC="$2"
 PRODUCT=zoom
 PRODUCTDIR=/opt/zoom
 
+PREINSTALL_PACKAGES="glib2 libalsa libatk libat-spi2-core libcairo libcairo-gobject libcups libdbus libdrm libEGL libexpat libgbm libgdk-pixbuf libgio libGL libgomp1 libgtk+3 libkrb5 libnspr libnss libpango libpulseaudio libwayland-client libwayland-cursor libwayland-egl libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbcommon-x11 libXrandr libXtst zlib"
+
 . $(dirname $0)/common-chromium-browser.sh
 
 # TODO: s/freetype/libfreetype/
@@ -89,6 +91,3 @@ install_deps
 
 fix_chrome_sandbox $PRODUCTDIR/cef/chrome-sandbox
 
-if [ "$(epm print info -s)" = "alt" ] ; then
-    epm --skip-installed install glib2 libalsa libatk libat-spi2-core libcairo libcairo-gobject libcups libdbus libdrm libEGL libexpat libgbm libgdk-pixbuf libgio libGL libgomp1 libgtk+3 libkrb5 libnspr libnss libpango libpulseaudio libwayland-client libwayland-cursor libwayland-egl libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXcomposite libXdamage libXext libXfixes libxkbcommon libxkbcommon-x11 libXrandr libXtst zlib
-fi