epm repack: stop autoreq: yes for some scripts

repack.d/cascadeur.sh

@@ -15,6 +15,7 @@ subst "s|^Summary:.*|Summary: Cascadeur - a physics‑based 3D animation softwar
 add_bin_exec_command
 
 # from https://www.producthunt.com/posts/cascadeur
+# QmQLQK6byKKzvvHEA84h4Auxci1o9T6bCQQikZFgRM8KBx
 install_file "https://ph-files.imgix.net/e07b5249-d804-4b4e-9458-fa037d30a14b.png?auto=compress&codec=mozjpeg&cs=strip&auto=format&w=72&h=72&fit=crop&bg=0fff&dpr=1" /usr/share/pixmaps/$PRODUCT.png
 
 # create desktop file

repack.d/dialog-ee-x.sh

@@ -9,4 +9,4 @@ SPEC="$2"
 # https://bugzilla.altlinux.org/show_bug.cgi?id=39099
 filter_from_requires '\\/opt\\/Dialog'
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/icq.sh

@@ -6,7 +6,7 @@ SPEC="$2"
 PRODUCT=icq
 PRODUCTCUR=icq
 
-PREINSTALL_PACKAGES="glib2 libdbus libexpat libgbm libgio libgpg-error libuuid zlib fontconfig libGL"
+#PREINSTALL_PACKAGES="glib2 libdbus libexpat libgbm libgio libgpg-error libuuid zlib fontconfig libGL"
 
 . $(dirname $0)/common.sh
 
@@ -54,6 +54,10 @@ install_file https://dashboard.snapcraft.io/site_media/appmedia/2020/04/icq_copy
 
 subst "s|.*/opt/icq/unittests.*||" $SPEC
 
+add_libs_requires
+
+exit
+
 # ignore embedded libs
 filter_from_requires libQt5 libxcb "libX.*"
 
@@ -75,5 +79,3 @@ for i in QtQuick/*/lib*.so  ; do
     a= patchelf --set-rpath '$ORIGIN/../../lib' $i
 done
 fi
-
-set_autoreq 'yes'

repack.d/lunacy.sh

@@ -8,8 +8,6 @@ PRODUCT=lunacy
 PRODUCTCUR=Lunacy
 PRODUCTDIR=/opt/icons8/lunacy
 
-PREINSTALL_PACKAGES="liblttng-ust libX11 fontconfig zlib"
-
 . $(dirname $0)/common.sh
 
 add_bin_link_command $PRODUCTCUR
@@ -19,5 +17,5 @@ fix_desktop_file /opt/icons8/lunacy/Lunacy $PRODUCT
 fix_desktop_file /opt/icons8/lunacy/Assets/LunacyLogo.png $PRODUCT
 install_file /opt/icons8/lunacy/Assets/LunacyLogo.png /usr/share/pixmaps/$PRODUCT.png
 
-set_autoreq 'yes,nomono,nomonolib'
+add_libs_requires
 

repack.d/meridius.sh

@@ -41,7 +41,4 @@ add_bin_exec_command $PRODUCT
 # error: version `GLIBC_2.33' not found (required by ./python3)
 remove_dir $PRODUCTDIR/resources/app.asar.unpacked/node_modules/register-scheme
 
-set_autoreq 'yes'
-
-# ignore embedded libs
-drop_embedded_reqs
+add_electron_deps

repack.d/rstudio.sh

@@ -29,3 +29,4 @@ filter_from_requires libQt5 libicu "libpq.so.5(RHPG_9"
 #    rm -v $BUILDROOT/usr/lib/rstudio/resources/app/bin/{diagnostics,rpostback,rsession}
 #fi
 
+add_libs_requires

repack.d/rupost-desktop.sh

@@ -4,17 +4,6 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-UNIREQUIRES="
-libX11-xcb.so.1 libX11.so.6 libXcomposite.so.1 libXcursor.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXi.so.6 libXrandr.so.2 libXrender.so.1 libXtst.so.6
-libasound.so.2 libatk-1.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libdbus-1.so.3 libdbus-glib-1.so.2
-libfontconfig.so.1 libfreetype.so.6
-libgdk-3.so.0 libgdk_pixbuf-2.0.so.0
-libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgtk-3.so.0
-libpango-1.0.so.0 libpangocairo-1.0.so.0
-librt.so.1 libstdc++.so.6
-libxcb-shm.so.0 libxcb.so.1
-"
-
 . $(dirname $0)/common.sh
 
 rm -v ./usr/bin/$PRODUCT
@@ -22,3 +11,4 @@ add_bin_link_command $PRODUCT $PRODUCTDIR/$PRODUCT.sh
 
 move_to_opt
 
+add_libs_requires

repack.d/rustdesk.sh

@@ -10,8 +10,6 @@ PRODUCTDIR=/usr/lib/$PRODUCT
 
 . $(dirname $0)/common.sh
 
-set_autoreq 'yes'
-
 # put service file to the normal place
 mkdir -p $BUILDROOT/etc/systemd/system/
 cp $BUILDROOT/usr/share/rustdesk/files/systemd/rustdesk.service $BUILDROOT/etc/systemd/system/$PRODUCT.service
@@ -60,6 +58,10 @@ filter_from_requires /etc/X11/xinit/Xsession /etc/default/locale /usr/etc/X11/xd
 
 fi
 
+set_autoreq 'yes'
+
+#add_libs_requires
+
 [ "$(epm print info -s)" = "alt" ] || exit 0
 
 install_requires glib2 libappindicator-gtk3 libcairo libgdk-pixbuf libgtk+3 libpango libpulseaudio libuuid libX11 libXau libxcb libXdmcp libXfixes libXtst xdotool

repack.d/sbb.sh

@@ -3,11 +3,14 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-REQUIRES="libcurl-gnutls-compat postgresql"
-PREINSTALL_PACKAGES="libcurl libsqlite3 libX11 libxml2 zlib $REQUIRES"
+#REQUIRES="libcurl-gnutls-compat postgresql"
+#PREINSTALL_PACKAGES="libcurl libsqlite3 libX11 libxml2 zlib $REQUIRES"
 
 . $(dirname $0)/common.sh
 
+add_libs_requires
+exit
+
 # ошибка: Неудовлетворенные зависимости:
 #    libcurl.so.4(CURL_OPENSSL_3)(64bit) нужен для sbb-02.008.02-alt1.repacked.with.epm.20.x86_64
 

repack.d/sferum.sh

@@ -18,4 +18,4 @@ fix_chrome_sandbox
 
 fix_desktop_file /opt/Sferum/sferum
 
-set_autoreq 'yes'
+add_electron_deps

repack.d/signal-desktop.sh

@@ -10,8 +10,6 @@ PRODUCTDIR=/opt/$PRODUCTCUR
 
 . $(dirname $0)/common-chromium-browser.sh
 
-add_electron_deps
-
 subst "s|.*/etc/apt.*||" $SPEC
 subst '/linux-arm64/d' $SPEC
 rm -rf $BUILDROOT/opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/node_modules/ref-napi/prebuilds/linux-arm64
@@ -19,3 +17,6 @@ rm -rf $BUILDROOT/opt/Signal/resources/app.asar.unpacked/node_modules/ffi-napi/n
 fix_chrome_sandbox
 
 add_bin_link_command
+
+add_electron_deps
+

repack.d/skypeforlinux.sh

@@ -21,8 +21,9 @@ remove_file /usr/bin/skypeforlinux
 add_bin_link_command $PRODUCTCUR $PRODUCTDIR/$PRODUCTCUR
 add_bin_link_command $PRODUCT $PRODUCTCUR
 
-add_electron_deps
-
 fix_chrome_sandbox
 
 fix_desktop_file /usr/bin/skypeforlinux
+
+add_electron_deps
+

repack.d/snap4arduino.sh

@@ -40,4 +40,4 @@ GenericName[en]=Use Snap! to control Arduino boards. Arduino goes lambda!
 EOF
 subst "s|%files|%files\n/usr/share/applications/$PRODUCT.desktop|" $SPEC
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/softmaker-freeoffice-2021.sh

@@ -7,12 +7,11 @@ PRODUCT=freeoffice2021
 PRODUCTDIR=/usr/share/freeoffice2021
 VERSION=free21
 
-PREINSTALL_PACKAGES="coreutils file gawk grep libcurl libGL libX11 libXext libXmu libXrandr libXrender sed xprop"
+#PREINSTALL_PACKAGES="coreutils file gawk grep libcurl libGL libX11 libXext libXmu libXrandr libXrender sed xprop"
+UNIREQUIRES="coreutils file gawk grep sed xprop"
 
 . $(dirname $0)/common.sh
 
-set_autoreq 'yes'
-
 remove_file $PRODUCTDIR/add_rpm_repo.sh
 
 filter_from_requires dnf gconftool-2 gnomevfs-info kfile rpmkeys yum
@@ -82,3 +81,4 @@ epm tool erc dwr.tar.lzma || fatal
 mv -v dwr.tar/* . || fatal
 remove_file $PRODUCTDIR/dwr.tar.lzma
 
+add_libs_requires

repack.d/spnxclient.sh

@@ -6,8 +6,6 @@ SPEC="$2"
 
 . $(dirname $0)/common.sh
 
-set_autoreq 'yes'
-
 add_requires libpcsclite libudev0
 
 if [ "$(epm print info -a)" = "x86_64" ] ; then
@@ -20,6 +18,8 @@ else
     subst "s|/usr/lib/i386-linux-gnu/libpcsclite.so|/usr/lib/libpcsclite.so|" $BUILDROOT/usr/bin/spnxclient
 fi
 
+add_libs_requires
+
 # https://sigur.com/download/
 echo "WARNING! Just see these crazy pre/post install scripts in the original deb package."
 exit 1

repack.d/spotify-client.sh

@@ -15,8 +15,6 @@ mkdir -p $BUILDROOT$LIBDIR/
 mv $BUILDROOT/usr/share/$PRODUCT/ $BUILDROOT$LIBDIR/$PRODUCT/
 subst "s|/usr/share/$PRODUCT|$LIBDIR/$PRODUCT|g" $SPEC
 
-set_autoreq 'yes'
-
 # see https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=spotify
 mkdir -p $BUILDROOT/usr/bin/
 ln -sf $LIBDIR/$PRODUCT/$PRODUCT $BUILDROOT/usr/bin/$PRODUCT
@@ -30,3 +28,4 @@ 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
 
+add_libs_requires

repack.d/sublime-text.sh

@@ -68,4 +68,4 @@ OnlyShowIn=Unity;
 EOF
 subst "s|%files|%files\n/usr/share/applications/$PRODUCT.desktop|" $SPEC
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/synology-drive.sh

@@ -15,26 +15,6 @@ cd $BUILDROOT/$PRODUCTDIR || exit
 # disable autoupdate
 remove_file $PRODUCTDIR/package/cloudstation/bin/cloud-drive-auto-updater
 
-if epm assure patchelf ; then
-for i in lib/lib*.so.* package/cloudstation/lib/lib*.so.* ; do
-    a= patchelf --set-rpath '$ORIGIN' $i
-done
-
-# /opt/Synology/SynologyDrive/package/cloudstation/lib/plugins/designer/libqquickwidget.so
-for i in package/cloudstation/lib/plugins/designer/lib*.so ; do
-    a= patchelf --set-rpath '$ORIGIN../../' $i
-done
-
-for i in bin/launcher package/cloudstation/bin/cloud-drive-* ; do
-    a= patchelf --set-rpath '$ORIGIN/../lib' $i
-done
-fi
-
-# TODO: some dependency leak?
-# ignore embedded libs
-filter_from_requires libQt5
-
-
 # Suggests
 # epm install --skip-installed libnautilus libnautilus-extension-compat
 filter_from_requires libnautilus
@@ -57,4 +37,26 @@ remove_file $PRODUCTDIR/package/cloudstation/icon-overlay/15/lib/plugin-cb.so ||
 # TODO: parse
 # https://www.synology.com/api/support/findDownloadInfo?lang=ru-ru&product=DS2411%2B&major=6&minor=2
 
-set_autoreq 'yes'
+add_libs_requires
+exit
+
+if epm assure patchelf ; then
+for i in lib/lib*.so.* package/cloudstation/lib/lib*.so.* ; do
+    a= patchelf --set-rpath '$ORIGIN' $i
+done
+
+# /opt/Synology/SynologyDrive/package/cloudstation/lib/plugins/designer/libqquickwidget.so
+for i in package/cloudstation/lib/plugins/designer/lib*.so ; do
+    a= patchelf --set-rpath '$ORIGIN../../' $i
+done
+
+for i in bin/launcher package/cloudstation/bin/cloud-drive-* ; do
+    a= patchelf --set-rpath '$ORIGIN/../lib' $i
+done
+fi
+
+# TODO: some dependency leak?
+# ignore embedded libs
+filter_from_requires libQt5
+
+

repack.d/t1client-standalone.sh

@@ -12,3 +12,5 @@ PRODUCTDIR=/opt/dssl/t1client
 add_bin_link_command $PRODUCT $PRODUCTDIR/run_t1client.sh
 
 fix_desktop_file /opt/dssl/t1client/run_t1client.sh $PRODUCT
+
+add_libs_requires

repack.d/tamtam-app.sh

@@ -19,4 +19,4 @@ fix_chrome_sandbox
 
 fix_desktop_file /opt/TamTam/tamtam
 
-set_autoreq 'yes'
+add_electron_deps

repack.d/teams.sh

@@ -23,11 +23,9 @@ mkdir -p $BUILDROOT/$LIBDIR
 mv -v $BUILDROOT/usr/share/teams/ $BUILDROOT/$LIBDIR/
 subst "s|/usr/share/teams|$LIBDIR/$PRODUCT|" $SPEC
 
-set_autoreq 'yes'
-
-# ignore embedded libs
-drop_embedded_reqs
-
 fix_chrome_sandbox
 
+add_electron_deps
+
 fix_desktop_file /usr/bin/teams
+

repack.d/teamspeak3.sh

@@ -52,3 +52,5 @@ if [ "$libevent" != "libevent-2.1.so.7" ] && epm assure patchelf ; then
     # Fix libquazip1-qt5.so name
     #patchelf --replace-needed libquazip.so libquazip1-qt5.so.1.0.0 .$PRODUCTDIR/ts3client_linux_amd64
 fi
+
+add_libs_requires

repack.d/teamviewer.sh

@@ -6,12 +6,7 @@ SPEC="$2"
 
 PRODUCTDIR=/opt/teamviewer
 
-UNIREQUIRES="xdg-utils
-libEGL.so.1 libGL.so.1 libICE.so.6 libSM.so.6 libX11-xcb.so.1 libX11.so.6 libXext.so.6 libc.so.6 libdbus-1.so.3 libdl.so.2
-libfontconfig.so.1 libfreetype.so.6
-libglib-2.0.so.0 libgthread-2.0.so.0 libm.so.6
-libminizip.so.1 libnspr4.so libnss3.so libnssutil3.so libplc4.so libplds4.so libpthread.so.0 libresolv.so.2 librt.so.1
-libsmime3.so libsoftokn3.so libuuid.so.1 libxcb-glx.so.0 libxcb-render.so.0 libxcb-shape.so.0 libxcb-shm.so.0 libxcb-sync.so.1 libxcb-xfixes.so.0 libxcb.so.1 libz.so.1"
+UNIREQUIRES="xdg-utils"
 
 . $(dirname $0)/common.sh
 
@@ -28,3 +23,4 @@ remove_dir /opt/teamviewer/tv_bin/xdg-utils
 
 remove_file /opt/teamviewer/tv_bin/script/teamviewerd.sysv
 
+add_libs_requires

repack.d/trueconf-server.sh

@@ -3,7 +3,7 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-PREINSTALL_PACKAGES="coreutils gawk libapr1 libaprutil1 libcares libcrypt libcrypto1.1 libcurl liblame libldap libncurses libnghttp2 libnsl1 libpcre3 libpng16 libpq5 libreadline7 libspeex libssl1.1 libtinfo libxml2 systemd-utils zlib"
+#PREINSTALL_PACKAGES="coreutils gawk libapr1 libaprutil1 libcares libcrypt libcrypto1.1 libcurl liblame libldap libncurses libnghttp2 libnsl1 libpcre3 libpng16 libpq5 libreadline7 libspeex libssl1.1 libtinfo libxml2 systemd-utils zlib"
 
 . $(dirname $0)/common.sh
 
@@ -11,11 +11,8 @@ PREINSTALL_PACKAGES="coreutils gawk libapr1 libaprutil1 libcares libcrypt libcry
 #                   Требует: liblber-2.4.so.2(OPENLDAP_2.4_2)(64bit) но пакет не может быть установлен
 #                   Требует: libldap_r-2.4.so.2(OPENLDAP_2.4_2)(64bit) но пакет не может быть установлен
 
-subst '1i%filter_from_requires /^libcurl.so.4(CURL_OPENSSL_.*/d' $SPEC
-subst '1i%filter_from_requires /^liblber-2.4.so.2(OPENLDAP_.*/d' $SPEC
-subst '1i%filter_from_requires /^libldap_r-2.4.so.2(OPENLDAP_.*/d' $SPEC
+#subst '1i%filter_from_requires /^libcurl.so.4(CURL_OPENSSL_.*/d' $SPEC
+#subst '1i%filter_from_requires /^liblber-2.4.so.2(OPENLDAP_.*/d' $SPEC
+#subst '1i%filter_from_requires /^libldap_r-2.4.so.2(OPENLDAP_.*/d' $SPEC
 
-#REQUIRES="libcurl libldap"
-#subst "1iRequires:$REQUIRES|" $SPEC
-
-set_autoreq 'yes'
+add_libs_requires

repack.d/trueconf.sh

@@ -9,14 +9,22 @@ PRODUCTDIR=/opt/trueconf
 
 . $(dirname $0)/common.sh
 
-PREINSTALL_PACKAGES="$(epm requires "$ORIGINPACKAGE")"
-[ -n "$PREINSTALL_PACKAGES" ] && install_requires $PREINSTALL_PACKAGES
+# follow original requires
+reqs="$(epm requires "$ORIGINPACKAGE")"
+[ -n "$reqs" ] && add_requires $reqs
 
 add_bin_link_command
 
 chmod a+x $BUILDROOT/opt/trueconf/trueconf
 chmod a+x $BUILDROOT/opt/trueconf/trueconf-autostart
 
+# TODO: report the bug:
+# libhwloc.so.5 => not found (we have only libhwloc.so.15)
+remove_file $PRODUCTDIR/lib/libtbbbind.so
+remove_file $PRODUCTDIR/lib/libtbbbind.so.2
+
+exit
+
 if epm assure patchelf ; then
 for i in lib/lib*.so  ; do
     a= patchelf --set-rpath '$ORIGIN' $BUILDROOT$PRODUCTDIR/$i
@@ -27,9 +35,3 @@ for i in TrueConf ; do
 done
 fi
 
-# TODO: report the bug:
-# libhwloc.so.5 => not found (we have only libhwloc.so.15)
-remove_file $PRODUCTDIR/lib/libtbbbind.so
-remove_file $PRODUCTDIR/lib/libtbbbind.so.2
-
-set_autoreq 'yes'

repack.d/unigine-heaven.sh

@@ -33,11 +33,11 @@ pack_dir $PRODUCTDIR/bin
 
 add_bin_link_command $PRODUCT /usr/bin/heaven
 
-if epm assure patchelf ; then
-for i in *_x64 lib*_x64.so* ; do
-    a= patchelf --set-rpath '$ORIGIN' $i
-done
-fi
+#if epm assure patchelf ; then
+#for i in *_x64 lib*_x64.so* ; do
+#    a= patchelf --set-rpath '$ORIGIN' $i
+#done
+#fi
 
 mkdir -p $BUILDROOT/usr/bin
 cat <<EOF >$BUILDROOT/usr/bin/heaven
@@ -65,4 +65,4 @@ EOF
 
 pack_file /usr/share/applications/$PRODUCT.desktop
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/unigine-superposition.sh

@@ -7,8 +7,6 @@ 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
@@ -25,11 +23,11 @@ done
 
 cd $BUILDROOT/$PRODUCTDIR || fatal
 
-if epm assure patchelf ; then
-for i in bin/lib*.so bin/qt/lib/lib*.so*; do
-    a= patchelf --set-rpath '$ORIGIN' $i
-done
-fi
+#if epm assure patchelf ; then
+#for i in bin/lib*.so bin/qt/lib/lib*.so*; do
+#    a= patchelf --set-rpath '$ORIGIN' $i
+#done
+#fi
 
 # pack icons
 for i in 16 24 32 48 64 128 256 ; do
@@ -71,4 +69,4 @@ EOF
 
 pack_file /usr/share/applications/$PRODUCT.desktop
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/unigine-valley.sh

@@ -34,11 +34,11 @@ pack_dir $PRODUCTDIR/bin
 
 add_bin_link_command $PRODUCT /usr/bin/valley
 
-epm assure patchelf || exit
+#epm assure patchelf || exit
 
-for i in *_x64 lib*_x64.so* ; do
-    a= patchelf --set-rpath '$ORIGIN' $i
-done
+#for i in *_x64 lib*_x64.so* ; do
+#    a= patchelf --set-rpath '$ORIGIN' $i
+#done
 
 
 mkdir -p $BUILDROOT/usr/bin
@@ -67,4 +67,4 @@ EOF
 
 pack_file /usr/share/applications/$PRODUCT.desktop
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/unityhub.sh

@@ -3,9 +3,6 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-# 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
 
 add_bin_link_command
@@ -14,5 +11,4 @@ fix_desktop_file
 
 fix_chrome_sandbox
 
-set_autoreq 'yes,nomono,nomonolib'
-
+add_libs_requires

repack.d/viber.sh

@@ -7,15 +7,13 @@ 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
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
-subst '1i%filter_from_requires /^libtiff.so.5(LIBTIFF_.*/d' $SPEC
+#subst '1i%filter_from_requires /^libtiff.so.5(LIBTIFF_.*/d' $SPEC
 
 fix_desktop_file
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/virtualhere.sh

@@ -30,4 +30,4 @@ pack_dir /etc/$PRODUCT
 
 pack_file /etc/systemd/system/$PRODUCT.service
 
-set_autoreq 'yes'
+add_libs_requires

repack.d/vk-calls.sh

@@ -11,19 +11,11 @@ PRODUCTDIR=/opt/vk-calls
 
 move_to_opt /usr/opt/vk-calls
 
-set_autoreq 'yes'
-
 remove_file /usr/local/bin/$PRODUCT
 add_bin_link_command
 
-if epm assure patchelf ; then
-for i in .$PRODUCTDIR/lib* .$PRODUCTDIR/$PRODUCT  ; do
-    a= patchelf --set-rpath '$ORIGIN' $i
-done
-fi
-
 # https://git.altlinux.org/tasks/316139
-epm install --skip-installed --no-remove libmfx || epm install --no-remove 316139 || fatal "Can't install libmfx"
+#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
@@ -38,3 +30,16 @@ cat >etc/tmpfiles.d/$PRODUCT.conf <<EOF
 f	/var/lock/vkcallsrelease.pid	0666	root	root	-	-
 EOF
 pack_file /etc/tmpfiles.d/$PRODUCT.conf
+
+
+add_libs_requires
+# autoreq is disabled: don't patch elf due requires
+exit
+
+
+if epm assure patchelf ; then
+for i in .$PRODUCTDIR/lib* .$PRODUCTDIR/$PRODUCT  ; do
+    a= patchelf --set-rpath '$ORIGIN' $i
+done
+fi
+

repack.d/vkteams.sh

@@ -5,8 +5,6 @@ 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
@@ -47,6 +45,10 @@ install_file $ICONURL /usr/share/pixmaps/$PRODUCT.png
 
 subst "s|.*$PRODUCTDIR/unittests.*||" $SPEC
 
+add_libs_requires
+# autoreq is disabled: don't patch elf due requires
+exit
+
 cd $BUILDROOT$PRODUCTDIR
 
 if epm assure patchelf ; then

repack.d/weasis.sh

@@ -6,8 +6,6 @@ SPEC="$2"
 
 PRODUCT=weasis
 
-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
 
 add_bin_link_command weasis $PRODUCTDIR/bin/Weasis
@@ -27,6 +25,10 @@ fix_desktop_file "/opt/weasis/bin/Dicomizer"
 fix_desktop_file "/opt/weasis/lib/Weasis"
 fix_desktop_file "/opt/weasis/lib/Dicomizer"
 
+add_libs_requires
+# autoreq is disabled: don't patch elf due requires
+exit
+
 cd $BUILDROOT$PRODUCTDIR/ || fatal
 if epm assure patchelf ; then
     for i in lib/runtime/lib/lib*.so ; do

repack.d/webex.sh

@@ -8,6 +8,10 @@ PRODUCT=webex
 
 . $(dirname $0)/common.sh
 
+add_libs_requires
+# autoreq is disabled: don't patch elf due requires
+exit
+
 # drop external requires
 filter_from_requires libutil.so
 

repack.d/wps-office.sh

@@ -20,5 +20,4 @@ remove_file /usr/share/desktop-directories/wps-office.directory
 # ALT bug 45683
 remove_file /opt/kingsoft/wps-office/office6/wpscloudsvr
 
-#epm install --skip-installed bzlib fontconfig libalsa libcairo libcups libdrm libfreetype /usr/bin/perl 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
-
+add_libs_requires

repack.d/xnview.sh

@@ -3,21 +3,6 @@
 BUILDROOT="$1"
 SPEC="$2"
 
-UNIREQUIRES="libEGL.so.1 libGL.so.1
-libQt5MultimediaGstTools.so.5 libQt5WaylandClient.so.5
-libX11-xcb.so.1 libX11.so.6 libXcomposite.so.1 libXext.so.6
-libasound.so.2 libatk-1.0.so.0 libcairo-gobject.so.2 libcairo.so.2 libcups.so.2 libdbus-1.so.3 libdrm.so.2
-libfontconfig.so.1 libfreetype.so.6 libgbm.so.1 libgcc_s.so.1 libgdk-3.so.0 libgdk-x11-2.0.so.0 libgdk_pixbuf-2.0.so.0
-libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0
-libgssapi_krb5.so.2 libgstallocators-1.0.so.0 libgstapp-1.0.so.0 libgstaudio-1.0.so.0 libgstbase-1.0.so.0 libgstpbutils-1.0.so.0 libgstreamer-1.0.so.0 libgstvideo-1.0.so.0
-libgthread-2.0.so.0 libgtk-3.so.0 libgtk-x11-2.0.so.0
-libc.so.6 libm.so.6 librt.so.1 libdl.so.2  libstdc++.so.6
-libpango-1.0.so.0 libpangocairo-1.0.so.0
-libpthread.so.0 libpulse-mainloop-glib.so.0 libpulse.so.0
-libwayland-client.so.0 libwayland-cursor.so.0 libwayland-egl.so.1
-libxcb-glx.so.0 libxcb-icccm.so.4 libxcb-image.so.0 libxcb-keysyms.so.1 libxcb-randr.so.0 libxcb-render-util.so.0 libxcb-render.so.0 libxcb-shape.so.0 libxcb-shm.so.0 libxcb-sync.so.1 libxcb-xfixes.so.0
-libxcb-xinerama.so.0 libxcb-xkb.so.1libxcb.so.1
-libxkbcommon-x11.so.0 libxkbcommon.so.0
-libz.so.1"
-
 . $(dirname $0)/common.sh
+
+add_libs_requires

repack.d/zoom.sh

@@ -6,16 +6,6 @@ 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"
-UNIREQUIRES="libEGL.so.1 libGL.so.1 libX11-xcb.so.1 libX11.so.6 libXcomposite.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXrandr.so.2 libXtst.so.6 libasound.so.2
-libatk-1.0.so.0 libatk-bridge-2.0.so.0 libatspi.so.0 libcairo-gobject.so.2 libcairo.so.2 libcups.so.2 libdbus-1.so.3
-libdrm.so.2 libexpat.so.1 libfontconfig.so.1 libfreetype.so.6 libgbm.so.1
-libgdk-3.so.0 libgdk_pixbuf-2.0.so.0 libgio-2.0.so.0 libglib-2.0.so.0 libgmodule-2.0.so.0 libgobject-2.0.so.0 libgomp.so.1 libgssapi_krb5.so.2
-libgthread-2.0.so.0 libgtk-3.so.0 libnspr4.so libnss3.so libnssutil3.so libpango-1.0.so.0 libpangocairo-1.0.so.0 libsmime3.so
-libwayland-client.so.0 libwayland-cursor.so.0 libwayland-egl.so.1
-libxcb-glx.so.0 libxcb-icccm.so.4 libxcb-image.so.0 libxcb-keysyms.so.1 libxcb-randr.so.0 libxcb-render-util.so.0 libxcb-render.so.0 libxcb-shape.so.0 libxcb-shm.so.0 libxcb-sync.so.1
-libxcb-xfixes.so.0 libxcb-xinerama.so.0 libxcb-xkb.so.1 libxcb-xtest.so.0 libxcb.so.1 libxkbcommon-x11.so.0 libxkbcommon.so.0 libz.so.1"
-
 . $(dirname $0)/common-chromium-browser.sh
 
 # TODO: remove it after fix https://bugzilla.altlinux.org/42189
@@ -27,6 +17,7 @@ fix_chrome_sandbox $PRODUCTDIR/cef/chrome-sandbox
 
 fix_desktop_file /usr/bin/zoom
 
+add_libs_requires
 # autoreq is disabled: don't patch elf due requires
 exit