epm repack: restore AutoReq where it is used

repack.d/1c83-client.sh

@@ -19,9 +19,6 @@ subst "s|^License: unknown$|License: Proprietary|" $SPEC
 subst "s|^URL:.*|URL: https://1c.ru|" $SPEC
 subst "s|^Summary:.*|Summary: 1C 8.3 Client|" $SPEC
 
-subst '1iAutoProv:no' $SPEC
-subst '1iAutoReq:no' $SPEC
-
 #remove_file /usr/local/bin/$PRODUCT
 #add_bin_link_command
 

repack.d/64Gram.sh

@@ -80,3 +80,5 @@ Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;
 X-GNOME-UsesNotifications=true
 EOF
 pack_file /usr/share/applications/$PRODUCT.desktop
+
+set_autoreq 'yes'

repack.d/Autodesk_EAGLE.sh

@@ -11,8 +11,6 @@ INSTALL_PACKAGES="coreutils fontconfig glib2 libalsa libcom_err libcups libdrm l
 
 . $(dirname $0)/common.sh
 
-#subst '1iAutoProv:no' $SPEC
-
 # move package to /opt
 ROOTDIR=$(basename $(find $BUILDROOT -mindepth 1 -maxdepth 1 -type d))
 subst "s|^License: unknown$|License: Freeware|" $SPEC
@@ -59,3 +57,5 @@ if epm assure patchelf ; then
         a= patchelf --set-rpath '$ORIGIN/' $i
     done
 fi
+
+set_autoreq 'yes'

repack.d/ClipGrab.sh

@@ -6,3 +6,5 @@ SPEC="$2"
 . $(dirname $0)/common.sh
 
 add_requires yt-dlp
+
+set_autoreq 'yes'

repack.d/DJV2.sh

@@ -15,7 +15,7 @@ PREINSTALL_PACKAGES="libalsa libGLX libOpenGL libX11 libxcb libXext zlib"
 
 move_to_opt /usr/local/DJV2
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 rm -v $BUILDROOT/usr/bin/djv
 

repack.d/ICAClient.sh

@@ -13,3 +13,5 @@ subst '1i%filter_from_requires /^libc.so.6(GLIBC_PRIVATE).*/d' $SPEC
 
 # Add requires of lsb-init for init script
 subst '/Group/Requires: lsb-init' $SPEC
+
+set_autoreq 'yes'

repack.d/PacketTracer.sh

@@ -6,8 +6,7 @@ SPEC="$2"
 # reenable console output
 subst 's| > /dev/null 2>&1||' $BUILDROOT/opt/pt/packettracer
 
-subst '1iAutoProv:no' $SPEC
-subst '1iAutoReq:yes,nopython' $SPEC
+set_autoreq 'yes,nopython'
 
 #REQUIRES="libcurl libldap"
 #subst "1iRequires:$REQUIRES|" $SPEC

repack.d/Pencil.sh

@@ -19,3 +19,5 @@ fix_chrome_sandbox
 fix_desktop_file
 
 subst '1iConflicts: pencil' $SPEC
+
+set_autoreq 'yes'

repack.d/SweetHome3D.sh

@@ -75,5 +75,5 @@ chmod -v a+x runtime/bin/*
 
 add_findreq_skiplist "$PRODUCTDIR/runtime/lib/amd64/libav*.so"
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 

repack.d/Telegram.sh

@@ -82,3 +82,5 @@ Keywords=tg;chat;im;messaging;messenger;sms;tdesktop;
 X-GNOME-UsesNotifications=true
 EOF
 pack_file /usr/share/applications/$PRODUCT.desktop
+
+set_autoreq 'yes'

repack.d/XenDesktopVDA.sh

@@ -13,3 +13,5 @@ if [ "$(epm print info -a)" = "x86_64" ] ; then
 fi
 
 filter_from_requires AuthManagerDaemon
+
+set_autoreq 'yes'

repack.d/aimp.sh

@@ -9,9 +9,6 @@ PRODUCTDIR=/opt/$PRODUCT
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 add_requires '/usr/bin/wine'
 add_requires '/bin/sh'
 

repack.d/aksusbd.sh

@@ -5,8 +5,7 @@ SPEC="$2"
 
 . $(dirname $0)/common.sh
 
-#subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 install_file /var/hasplm/init/hasplmd.service /etc/systemd/system/hasplmd.service
 install_file /var/hasplm/init/aksusbd.service /etc/systemd/system/aksusbd.service

repack.d/anydesk.sh

@@ -20,8 +20,7 @@ PREINSTALL_PACKAGES="fontconfig glib2 libatk libcairo libfreetype libgdk-pixbuf
 #subst "s|.*/etc/default/NetworkManager.*||" $BUILDROOT/etc/rc.d/init.d/anydesk
 #subst "s|/usr/share/anydesk/files/init/anydesk|/etc/rc.d/init.d/anydesk|" $SPEC
 
-
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 remove_file /usr/share/anydesk/files/init/anydesk
 

repack.d/atom-beta.sh

@@ -23,8 +23,7 @@ PREINSTALL_PACKAGES="coreutils findutils git-core glib2 grep libalsa libatk liba
 
 . $(dirname $0)/common-chromium-browser.sh
 
-subst '1iAutoReq:yes,nomonolib,nomono,nopython' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes,nomonolib,nomono,nopython'
 
 move_to_opt
 subst "s|\$USR_DIRECTORY/share/atom|/opt/atom|" $BUILDROOT/usr/bin/$PRODUCTCUR

repack.d/audiorelay.sh

@@ -10,9 +10,6 @@ PREINSTALL_PACKAGES="$PREINSTALL_PACKAGES alsa-plugins-pulse"
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 add_bin_exec_command $PRODUCT $PRODUCTDIR/bin/AudioRelay
 install_file $PRODUCTDIR/lib/AudioRelay.png /usr/share/pixmaps/$PRODUCT.png
 

repack.d/bitwarden.sh

@@ -19,3 +19,4 @@ fix_chrome_sandbox
 
 fix_desktop_file
 
+set_autoreq 'yes'

repack.d/brave-browser-beta.sh

@@ -23,4 +23,3 @@ use_system_xdg
 
 add_deps
 
-subst '1iAutoReq:no' $SPEC

repack.d/brave-browser-dev.sh

@@ -23,4 +23,3 @@ use_system_xdg
 
 add_deps
 
-subst '1iAutoReq:no' $SPEC

repack.d/brave-browser-nightly.sh

@@ -23,4 +23,3 @@ use_system_xdg
 
 add_deps
 
-subst '1iAutoReq:no' $SPEC

repack.d/brave-browser.sh

@@ -25,4 +25,3 @@ add_deps
 
 fix_desktop_file /usr/bin/$PRODUCTCUR
 
-subst '1iAutoReq:no' $SPEC

repack.d/brscanads2200ads2700w.sh

@@ -5,3 +5,5 @@ SPEC="$2"
 
 # Remove LIBJPEG version
 subst '1i%filter_from_requires /LIBJPEG.*_6.2/d' $SPEC
+
+set_autoreq 'yes'

repack.d/cascadeur.sh

@@ -6,9 +6,6 @@ SPEC="$2"
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 move_to_opt /cascadeur-linux
 
 subst "s|^License: unknown$|License: Proprietary|" $SPEC

repack.d/chat.sh

@@ -24,3 +24,4 @@ install_deps
 
 fix_chrome_sandbox
 
+set_autoreq 'yes'

repack.d/chrome-remote-desktop.sh

@@ -13,3 +13,5 @@ PREINSTALL_PACKAGES="coreutils glib2 libcairo libdbus libdrm libexpat libgbm lib
 cleanup
 
 subst '1iBuildRequires:rpm-build-python3' $SPEC
+
+set_autoreq 'yes'

repack.d/chromium-gost-stable.sh

@@ -47,3 +47,4 @@ else
 fi
 EOF
 
+set_autoreq 'yes'

repack.d/cnrdrvcups-ufr2-uk.sh

@@ -14,3 +14,4 @@ fi
 
 . $(dirname $0)/common.sh
 
+set_autoreq 'yes'

repack.d/code.sh

@@ -15,8 +15,7 @@ PREINSTALL_PACKAGES="at-spi2-atk coreutils findutils gawk glib2 libalsa libatk l
 
 move_to_opt
 
-subst '1iAutoReq:yes,nomonolib,nomono' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes,nomonolib,nomono'
 
 fix_desktop_file /usr/share/code/code
 

repack.d/codium.sh

@@ -13,8 +13,7 @@ PREINSTALL_PACKAGES="at-spi2-atk coreutils findutils gawk glib2 libalsa libatk l
 
 move_to_opt
 
-subst '1iAutoReq:yes,nomonolib,nomono' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes,nomonolib,nomono'
 
 remove_file /usr/bin/$PRODUCT
 add_bin_link_command

repack.d/commfort-client.sh

@@ -9,9 +9,6 @@ PRODUCTDIR=/opt/eepm-wine/$PRODUCT
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 add_requires '/usr/bin/wine'
 
 add_bin_link_command $PRODUCT $PRODUCTDIR/run.sh

repack.d/common-chromium-browser.sh

@@ -47,8 +47,6 @@ copy_icons_to_share()
 
 cleanup()
 {
-    subst '1iAutoProv: no' $SPEC
-
     # remove cron update
     remove_file /etc/cron.daily/$PRODUCTCUR
     remove_file /etc/cron.daily/$PRODUCT

repack.d/cuda-z.sh

@@ -39,3 +39,4 @@ 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
 # https://blog.redscorp.net/?p=94
 
+set_autoreq 'yes'

repack.d/dialog-ee-x.sh

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

repack.d/discord.sh

@@ -16,9 +16,6 @@ fix_chrome_sandbox
 
 add_deps
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 rm usr/bin/$PRODUCT
 add_bin_link_command $PRODUCTCUR $PRODUCTDIR/$PRODUCTCUR
 add_bin_link_command $PRODUCT $PRODUCTCUR

repack.d/domination-client.sh

@@ -20,3 +20,5 @@ install_deps
 
 fix_chrome_sandbox
 
+set_autoreq 'yes'
+

repack.d/draw.io.sh

@@ -16,3 +16,5 @@ add_bin_link_command $PRODUCTCUR $PRODUCT
 fix_desktop_file /opt/drawio/drawio
 
 fix_chrome_sandbox
+
+set_autoreq 'yes'

repack.d/duplicati.sh

@@ -14,8 +14,7 @@ add_requires mono-full libgtk-sharp2
 subst '1iBuildRequires: rpm-build-python3' $SPEC
 subst '1i%add_python3_path /usr/lib/duplicati' $SPEC
 
-subst '1iAutoProv: no' $SPEC
-subst '1iAutoReq: yes,nomonolib,nomono' $SPEC
+set_autoreq 'yes,nomonolib,nomono'
 
 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}

repack.d/epsonscan2.sh

@@ -5,10 +5,10 @@ SPEC="$2"
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoProv:no' $SPEC
-
 if epm assure patchelf ; then
 for i in usr/lib64/epsonscan2/lib*.so ; do
     a= patchelf --set-rpath '$ORIGIN/' $i || continue
 done
 fi
+
+set_autoreq 'yes'

repack.d/express.sh

@@ -16,3 +16,5 @@ install_deps
 #add_deps
 
 fix_chrome_sandbox
+
+set_autoreq 'yes'

repack.d/far2l-portable.sh

@@ -14,10 +14,6 @@ subst "s|^Group:.*|Group: File tools|" $SPEC
 subst "s|^URL:.*|URL: https://github.com/elfmz/far2l|" $SPEC
 subst "s|^Summary:.*|Summary: Linux port of FAR v2|" $SPEC
 
-
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 subst '1iConflicts: far2l' $SPEC
 
 add_bin_cdexec_command

repack.d/firefox-nightly.sh

@@ -17,8 +17,7 @@ PREINSTALL_PACKAGES="fontconfig glib2 libalsa libatk libcairo libcairo-gobject l
 #    subst "1iConflicts:$i" $SPEC
 #done
 
-subst '1iAutoReq:yes,noshell,nomonolib,nomono,nopython' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes,noshell,nomonolib,nomono,nopython'
 
 #set_alt_alternatives 65
 

repack.d/flashplayer.sh

@@ -8,7 +8,7 @@ PREINSTALL_PACKAGES="glib2 libfontconfig1 libfreetype libgdk-pixbuf libGL libgtk
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 subst "s|^License: unknown$|License: Proprietary|" $SPEC
 subst "s|^Summary:.*|Summary: Adobe Flash Player Standalone|" $SPEC

repack.d/flashprint5.sh

@@ -10,3 +10,4 @@ PREINSTALL_PACKAGES="libGL libGLU libqt5-core libqt5-gui libqt5-network libqt5-o
 
 move_file /usr/lib/libOCCTWrapper.so.1 /usr/lib64/libOCCTWrapper.so.1
 
+set_autoreq 'yes'

repack.d/freeplane.sh

@@ -5,9 +5,6 @@ SPEC="$2"
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 move_to_opt
 ln -sf $PRODUCTDIR/$PRODUCT.sh usr/bin/$PRODUCT
 fix_desktop_file "/usr/bin/freeplane/$PRODUCT"

repack.d/geogebra-classic.sh

@@ -11,7 +11,7 @@ PREINSTALL_PACKAGES="python3 rpm-build-python3"
 
 . $(dirname $0)/common-chromium-browser.sh
 
-subst '1iAutoReq:yes,noshell,nomonolib,nomono,nopython' $SPEC
+set_autoreq 'yes,noshell,nomonolib,nomono,nopython'
 
 subst '1iBuildRequires:rpm-build-python3' $SPEC
 subst "1i%add_python3_path $PRODUCTDIR" $SPEC

repack.d/gitkraken.sh

@@ -26,5 +26,4 @@ add_findreq_skiplist "$PRODUCTDIR/resources/app.asar.unpacked/node_modules/@msgp
 add_requires libXScrnSaver
 
 # TODO: replace gitkraken/resources/app.asar.unpacked/git with system's one optionally?
-subst '1iAutoReq:yes,noperl' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes,noperl'

repack.d/gitlab-runner.sh

@@ -18,7 +18,4 @@ PRODUCT=gitlab-runner
 #  $ rpm -q --provides -p gitlab-runner_amd64.rpm
 # gitlab-ci-multi-runner
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 add_requires curl git tar

repack.d/google-chrome-stable.sh

@@ -29,3 +29,4 @@ fix_desktop_file /usr/bin/google-chrome-stable
 
 install_deps
 
+set_autoreq 'yes'

repack.d/hansoft.sh

@@ -39,3 +39,5 @@ pack_file /usr/share/applications/$PRODUCT.desktop
 # copied from ~.local/share/icons/se.hansoft.Exe-PMClient_7B6AC2CBB8795205B8E6DC09CB75B5E6.png
 i=256
 install_file ipfs://QmbYM3wS2qXtWbUg9mASMPoJmgfL6smny1m3J4PfuiDtJR /usr/share/icons/hicolor/${i}x${i}/apps/$PRODUCT.png
+
+set_autoreq 'yes'

repack.d/hplip-plugin.sh

@@ -6,9 +6,6 @@ SPEC="$2"
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 subst "s|^License: unknown$|License: Proprietary|" $SPEC
 subst "s|^Summary:.*|Summary: Binary plugin for HPs hplip printer driver library|" $SPEC
 

repack.d/icq.sh

@@ -75,3 +75,5 @@ for i in QtQuick/*/lib*.so  ; do
     a= patchelf --set-rpath '$ORIGIN/../../lib' $i
 done
 fi
+
+set_autoreq 'yes'

repack.d/ipera-client.sh

@@ -27,3 +27,5 @@ filter_from_requires "libldap_r-2.4.so.2(OPENLDAP_2.*)(64bit)" "liblber-2.4.so.2
 # ignore embedded libs
 filter_from_requires libQt5 libav libcrypto.so libdbus-1.so libicu liblibraw.so libssl.so libswresample libswscale libva libvdpau
 filter_from_requires libgst libuv
+
+set_autoreq 'yes'

repack.d/ipera-mediaserver.sh

@@ -28,3 +28,5 @@ mkdir -p var/lib/ipera
 pack_dir /var/lib/ipera
 ln -s /var/lib/ipera .$PRODUCTDIR/var
 pack_file $PRODUCTDIR/var
+
+set_autoreq 'yes'

repack.d/iproject-client.sh

@@ -28,3 +28,4 @@ filter_from_requires "mono(Microsoft.Threading.Tasks.Extensions)"
 filter_from_requires "mono(System.Runtime)"
 filter_from_requires "mono(System.Threading.Tasks)"
 
+set_autoreq 'yes'

repack.d/iptvnator.sh

@@ -14,3 +14,5 @@ fix_chrome_sandbox
 install_deps
 
 add_bin_link_command
+
+set_autoreq 'yes'

repack.d/iwbdriver.sh

@@ -30,3 +30,5 @@ if epm assure patchelf ; then
         a= patchelf --set-rpath '$ORIGIN' $i
     done
 fi
+
+set_autoreq 'yes'

repack.d/iwdm.sh

@@ -9,3 +9,5 @@ SPEC="$2"
 # remove kernel related script
 rm -fv $BUILDROOT/opt/iw/dmagent/etc/initramfs-tools/hooks/iwdm
 subst 's|"*/opt/iw/dmagent/etc/initramfs-tools/hooks/iwdm"*||' $SPEC
+
+set_autoreq 'yes'

repack.d/iwtm-grafana.sh

@@ -12,4 +12,6 @@ subst 's|"*/etc/init.d/grafana-server"*||' $SPEC
 rm -fv $BUILDROOT/opt/iw/tm5/share/grafana/scripts/circle-test-*.sh
 subst 's|"*/opt/iw/tm5/share/grafana/scripts/circle-test-.*.sh"*||' $SPEC
 rm -rfv $BUILDROOT/opt/iw/tm5/share/grafana/scripts/build/
-subst 's|"*/opt/iw/tm5/share/grafana/scripts/build/.*"*||' $SPEC
\ No newline at end of file
+subst 's|"*/opt/iw/tm5/share/grafana/scripts/build/.*"*||' $SPEC
+
+set_autoreq 'yes'

repack.d/iwtm-prometheus.sh

@@ -9,3 +9,5 @@ SPEC="$2"
 # remove broken script
 rm -fv $BUILDROOT/etc/init.d/*
 subst 's|"*/etc/init.d/*"*||' $SPEC
+
+set_autoreq 'yes'

repack.d/jetbrains-toolbox.sh

@@ -31,3 +31,5 @@ EOF
 
 add_requires java-openjdk
 
+set_autoreq 'yes'
+

repack.d/k3s.sh

@@ -11,9 +11,6 @@ subst "s|^License:.*$|License: Apache-2.0|" $SPEC
 subst "s|^URL:.*|URL: https://k3s.io|" $SPEC
 subst "s|^Summary:.*|Summary: K3s - Lightweight Kubernetes|" $SPEC
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 subst '1iConflicts: kubernetes-client' $SPEC
 
 # Check https://get.k3s.io/

repack.d/kubo.sh

@@ -18,9 +18,7 @@ subst "s|^License:.*$|License: MIT/Apache-2.0|" $SPEC
 subst "s|^URL:.*|URL: https://github.com/ipfs/kubo|" $SPEC
 subst "s|^Summary:.*|Summary: An IPFS implementation in Go|" $SPEC
 
-
-#subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 subst '1iConflicts: go-ipfs' $SPEC
 subst '1iProvides: go-ipfs' $SPEC

repack.d/kyodialog.sh

@@ -14,7 +14,7 @@ PRODUCTCUR=$PRODUCT$VER
 # embedded
 filter_from_requires "python3(PyPDF3)"
 
-subst '1iAutoProv: no' $SPEC
+set_autoreq 'yes'
 
 # remove embedded PyPDF3
 remove_dir /usr/share/kyocera$VER/Python

repack.d/librewolf.sh

@@ -10,8 +10,7 @@ PREINSTALL_PACKAGES="fontconfig glib2 libalsa libatk libcairo libcairo-gobject l
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoReq:yes,noshell,nomonolib,nomono,nopython' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes,noshell,nomonolib,nomono,nopython'
 
 move_to_opt
 fix_desktop_file "/usr/share/$PRODUCT/$PRODUCT"

repack.d/lightworks.sh

@@ -9,7 +9,7 @@ SPEC="$2"
 # lib.req: ERROR: /tmp/.private/.../usr/lib/lightworks/libirng.so: no symbol bindings
 subst '1i%add_findreq_skiplist /usr/lib/lightworks/libirng.so /usr/lib/lightworks/libsvml.so' $SPEC
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 # ignore embedded libs
 for i in libc++.so.1 libc++abi.so.1 libedit.so libportaudio.so.2 libportaudiocpp.so.0 ; do

repack.d/liteide.sh

@@ -40,4 +40,6 @@ EOF
 pack_file /usr/share/applications/$PRODUCT.desktop
 
 # https://bugzilla.altlinux.org/45635
-add_requires golang
\ No newline at end of file
+add_requires golang
+
+set_autoreq 'yes'

repack.d/lithium_ecad.sh

@@ -11,8 +11,7 @@ move_to_opt "/opt/lithium*" || fatal "can't move to $PRODUCTDIR"
 
 add_bin_link_command $PRODUCT $PRODUCTDIR/launcher.sh
 
-#subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 cd $BUILDROOT$PRODUCTDIR || fatal
 if epm assure patchelf ; then

repack.d/lunacy.sh

@@ -19,6 +19,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
 
-subst '1iAutoProv:no' $SPEC
-subst '1iAutoReq:yes,nomono,nomonolib' $SPEC
+set_autoreq 'yes,nomono,nomonolib'
 

repack.d/lycheeslicer.sh

@@ -21,3 +21,6 @@ fix_desktop_file
 
 # ignore embedded libs
 filter_from_requires libQt5 node seamonkey thunderbird
+
+set_autoreq 'yes'
+

repack.d/mailruagent.sh

@@ -58,3 +58,5 @@ for i in QtQuick/*/lib*.so  ; do
     a= patchelf --set-rpath '$ORIGIN/../../lib' $i
 done
 fi
+
+set_autoreq 'yes'

repack.d/master-pdf-editor.sh

@@ -15,3 +15,6 @@ add_bin_link_command
 add_bin_link_command $PRODUCTCUR $PRODUCT
 
 fix_desktop_file
+
+set_autoreq 'yes'
+

repack.d/meridius.sh

@@ -41,7 +41,7 @@ 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
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 # ignore embedded libs
 drop_embedded_reqs

repack.d/microsoft-edge-stable.sh

@@ -41,3 +41,4 @@ for i in $BUILDROOT$PRODUCTDIR/libmip_*.so ; do
     [ "$(a= patchelf --print-interpreter $i)" = "/lib/x86_64-linux-gnu/ld-linux-x86-64.so.2" ] && a= patchelf --set-interpreter /lib64/ld-linux-x86-64.so.2 $i
 done
 
+set_autoreq 'yes'

repack.d/minecraft-launcher.sh

@@ -8,3 +8,5 @@ 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
+
+set_autoreq 'yes'

repack.d/mobirise.sh

@@ -19,3 +19,4 @@ fix_chrome_sandbox
 
 install_deps
 
+set_autoreq 'yes'

repack.d/mssql-server.sh

@@ -10,12 +10,12 @@ PREINSTALL_PACKAGES="libnuma libsss_nss_idmap bzip2 cyrus-sasl2 libcom_err libkr
 . $(dirname $0)/common.sh
 
 # we need libssl/libcrypto-devel due libssl.so/libcrypto.so using (ALT bug 35559)
-REQUIRES="python3 pbzip2 bzip2 gdb libnuma libkrb5 libsss_nss_idmap cyrus-sasl2 libsasl2-plugin-gssapi procps"
+add_requires="python3 pbzip2 bzip2 gdb libnuma libkrb5 libsss_nss_idmap cyrus-sasl2 libsasl2-plugin-gssapi procps"
 
 # ALT's su does not support -p last 20 years
 subst "s|su -p |su |" $BUILDROOT/opt/mssql/lib/mssql-conf/invokesqlservr.sh
 
-subst "1iAutoProv:no\nAutoReq:yes,nopython,nopython3\n# Converted from original package requires\nRequires:$REQUIRES\n" $SPEC
+set_autoreq 'yes,nopython,nopython3'
 
 # fix typo
 subst "s|Руѝѝкий|Русский|" $BUILDROOT/opt/mssql/lib/mssql-conf/mssqlconfhelper.py

repack.d/net.downloadhelper.coapp.sh

@@ -8,13 +8,12 @@ PREINSTALL_PACKAGES="ffmpeg ffplay ffprobe xdg-utils"
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq "yes"
 
 # fix libdir
 install_file /usr/lib/mozilla/native-messaging-hosts/net.downloadhelper.coapp.json /usr/lib64/mozilla/native-messaging-hosts/net.downloadhelper.coapp.json
 remove_dir /usr/lib
 
-#subst '1iAutoReq:no' $SPEC
 # use ffmpeg from the system
 remove_dir /opt/net.downloadhelper.coapp/converter/build/linux/64
 mkdir -p opt/net.downloadhelper.coapp/converter/build/linux/64

repack.d/obsidian.sh

@@ -28,3 +28,5 @@ fix_desktop_file
 #for i in $BUILDROOT$PRODUCTDIR/$PRODUCT ; do
 #    a= patchelf --set-rpath "$PRODUCTDIR" $i
 #done
+
+set_autoreq 'yes'

repack.d/onlyoffice-desktopeditors.sh

@@ -41,8 +41,4 @@ for i in 16 22 24 32 48 64 128 256 ; do
 done
 subst "s|%files|%files\n/usr/share/icons/hicolor/*x*/apps/$iconname.png|" $SPEC
 
-
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 fix_desktop_file /usr/bin/onlyoffice-desktopeditors

repack.d/opera-stable.sh

@@ -67,3 +67,5 @@ fi
 
 install_deps
 
+
+set_autoreq 'yes'

repack.d/pantum.sh

@@ -26,3 +26,4 @@ remove_dir /usr/local
 
 subst '1iRequires: libjpeg8' $SPEC
 
+set_autoreq 'yes'

repack.d/plex-desktop.sh

@@ -8,9 +8,6 @@ SPEC="$2"
 
 add_requires glib2 glxinfo libalsa libdbus libdrm libEGL libexpat fontconfig libfreetype libgbm libGLX libharfbuzz libjpeg8 liblcms2 libminizip libnspr libnss libOpenGL libopus libpci libpulseaudio libsnappy libtiff5 libudev1 libva libwayland-client libwayland-cursor libwayland-egl libwayland-server libX11 libxcb libxcb-render-util libxcbutil-icccm libxcbutil-image libxcbutil-keysyms libXcomposite libXdamage libXext libXfixes libXinerama libxkbcommon libxkbcommon-x11 libxkbfile libxml2 libXrandr libXrender libXScrnSaver libxshmfence libxslt libXtst which zlib
 
-subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
-
 add_bin_link_command $PRODUCT $PRODUCTDIR/Plex.sh
 
 cd .$PRODUCTDIR || fatal

repack.d/portmaster.sh

@@ -31,5 +31,6 @@ fix_chrome_sandbox $PRODUCTDIR/updates/linux_amd64/app/$p/chrome-sandbox
 
 pack_file $PRODUCTDIR/updates
 
-
 install_deps
+
+set_autoreq 'yes'

repack.d/portproton-remastered.sh

@@ -48,3 +48,5 @@ chmod a+rwX $BUILDROOT/var/lib/$PRODUCT
 ln -s /var/lib/$PRODUCT $BUILDROOT$PRODUCTDIR/data
 pack_file $PRODUCTDIR/data
 pack_file /var/lib/$PRODUCT
+
+set_autoreq 'yes'

repack.d/portproton.sh

@@ -11,3 +11,6 @@ PRODUCTDIR=/opt/PortProton
 add_requires bubblewrap cabextract curl gamemode icoutils libvulkan1 vulkan-tools wget zenity zstd gawk tar libd3d libMesaOpenCL /usr/bin/convert
 
 filter_from_requires xneur
+
+set_autoreq 'yes'
+

repack.d/pycharm-community.sh

@@ -87,5 +87,4 @@ pack_dir $PRODUCTDIR/bin/
 pack_dir $PRODUCTDIR/lib/
 pack_dir $PRODUCTDIR/plugins/
 
-subst '1iAutoProv:no' $SPEC
-subst '1iAutoReq:yes,nopython,nopython3,nomono,nomonolib' $SPEC
+set_autoreq 'yes,nopython,nopython3,nomono,nomonolib'

repack.d/pycharm-professional.sh

@@ -99,5 +99,4 @@ pack_dir $PRODUCTDIR/bin/
 pack_dir $PRODUCTDIR/lib/
 pack_dir $PRODUCTDIR/plugins/
 
-subst '1iAutoProv:no' $SPEC
-subst '1iAutoReq:yes,nopython,nopython3,nomono,nomonolib' $SPEC
+set_autoreq 'yes,nopython,nopython3,nomono,nomonolib'

repack.d/r7-office.sh

@@ -29,8 +29,7 @@ for i in $BUILDROOT$PRODUCTDIR/desktopeditors/{converter,platforms,platforminput
 done
 fi
 
-#subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 #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
 

repack.d/realvnc-vnc-server.sh

@@ -10,3 +10,4 @@ subst '1iConflicts: tigervnc' $SPEC
 
 filter_from_requires '\\/bin\\/chkconfig' '\\/bin\\/service' '\\/lib\\/svc\\/share\\/smf_include.sh'
 
+set_autoreq 'yes'

repack.d/realvnc-vnc-viewer.sh

@@ -7,3 +7,5 @@ SPEC="$2"
 . $(dirname $0)/common.sh
 
 subst '1iConflicts: tigervnc' $SPEC
+
+set_autoreq 'yes'

repack.d/remotedesktopmanager.sh

@@ -10,3 +10,5 @@ PRODUCT=remotedesktopmanager
 PRODUCTDIR=/usr/lib/devolutions/RemoteDesktopManager
 
 add_findreq_skiplist "$PRODUCTDIR/runtimes/*"
+
+set_autoreq 'yes'

repack.d/rocketchat.sh

@@ -22,3 +22,5 @@ subst "s|$PRODUCTDIR/||" $BUILDROOT/usr/share/applications/rocketchat-desktop.de
 #for i in $BUILDROOT$PRODUCTDIR/$PRODUCT ; do
 #    a= patchelf --set-rpath "$PRODUCTDIR" $i
 #done
+
+set_autoreq 'yes'

repack.d/rstudio.sh

@@ -17,7 +17,7 @@ add_bin_exec_command $PRODUCT
 subst 's|/usr/lib/rstudio/bin/rstudio|$PRODUCTDIR/$PRODUCT|' $BUILDROOT$PRODUCTDIR/resources/app/bin/rstudio-backtrace.sh
 
 # https://bugzilla.altlinux.org/43794
-subst '1iAutoReq:yes,nopython,nopython3,nomono,nomonolib' $SPEC
+set_autoreq 'yes,nopython,nopython3,nomono,nomonolib'
 
 fix_chrome_sandbox
 

repack.d/rustdesk.sh

@@ -10,7 +10,7 @@ PRODUCTDIR=/usr/lib/$PRODUCT
 
 . $(dirname $0)/common.sh
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 # put service file to the normal place
 mkdir -p $BUILDROOT/etc/systemd/system/

repack.d/sane-panakvs.sh

@@ -11,7 +11,5 @@ subst "s|^License:.*$|License: Proprietary|" $SPEC
 subst "s|^URL:.*|URL: https://github.com/zerotier/ZeroTierOne|" $SPEC
 subst "s|^Summary:.*|Summary: Panasonic Scanner Driver for Linux|" $SPEC
 
-
-#subst '1iAutoReq:no' $SPEC
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 

repack.d/sbb.sh

@@ -16,3 +16,4 @@ subst '1i%filter_from_requires /^libcurl-gnutls.so.4(CURL_GNUTLS_.*/d' $SPEC
 
 add_requires $REQUIRES
 
+set_autoreq 'yes'

repack.d/sbis-libstdc++.sh

@@ -10,3 +10,5 @@ LIBPATH="$(cd $BUILDROOT ; echo opt/gcc-*/lib64)"
 
 # find provides there
 subst "1i%set_findprov_lib_path /$LIBPATH" $SPEC
+
+set_autoreq 'yes'

repack.d/sferum.sh

@@ -17,3 +17,5 @@ add_bin_exec_command $PRODUCT $PRODUCTDIR/$PRODUCTCUR
 fix_chrome_sandbox
 
 fix_desktop_file /opt/Sferum/sferum
+
+set_autoreq 'yes'

repack.d/signal-desktop.sh

@@ -12,7 +12,7 @@ PRODUCTDIR=/opt/$PRODUCTCUR
 
 install_deps
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 subst "s|.*/etc/apt.*||" $SPEC
 subst '/linux-arm64/d' $SPEC

repack.d/skypeforlinux.sh

@@ -17,7 +17,7 @@ move_to_opt /usr/share/skypeforlinux
 
 subst "s|^SKYPE_PATH=.*|SKYPE_PATH=$PRODUCTDIR/skypeforlinux|" $BUILDROOT/usr/bin/skypeforlinux
 
-subst '1iAutoProv:no' $SPEC
+set_autoreq 'yes'
 
 # ignore embedded libs
 drop_embedded_reqs