epm repack.d: use filter_from_requires

repack.d/XenDesktopVDA.sh

@@ -4,12 +4,12 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+. $(dirname $0)/common.sh
+
 if [ "$($DISTRVENDOR -a)" = "x86_64" ] ; then
     # 32 bit
     rm -rfv $BUILDROOT/opt/Citrix/VDA/lib32
     subst "s|.*/libctxXrandrhook.so.||" $SPEC
 fi
 
-#REQUIRES=""
-subst "s|^\(Name: .*\)$|%filter_from_requires /AuthManagerDaemon/d\n\1|g" $SPEC
-
+filter_from_requires AuthManagerDaemon

repack.d/anydesk.sh

@@ -50,7 +50,5 @@ for i in $BUILDROOT/usr/libexec/anydesk ; do
 done
 
 # preloaded from /usr/lib64/anydesk/, drop external requires
-subst '1i%filter_from_requires /^libpangox-1.0.so.0.*/d' $SPEC
-subst '1i%filter_from_requires /^libgdkglext-x11-1.0.so.0.*/d' $SPEC
-subst '1i%filter_from_requires /^libgtkglext-x11-1.0.so.0.*/d' $SPEC
+filter_from_requires libpangox-1.0.so.0 libgdkglext-x11-1.0.so.0 libgtkglext-x11-1.0.so.0
 

repack.d/dialog-ee-x.sh

@@ -4,5 +4,7 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+. $(dirname $0)/common.sh
+
 # https://bugzilla.altlinux.org/show_bug.cgi?id=39099
-subst '1i%filter_from_requires /^.opt.Dialog$/d' $SPEC
+filter_from_requires "\\/opt\\/Dialog"

repack.d/onlyoffice-desktopeditors.sh

@@ -4,6 +4,8 @@
 BUILDROOT="$1"
 SPEC="$2"
 
+. $(dirname $0)/common.sh
+
 # TODO: required libreoffice-opensymbol-fonts
 # $ rpm -qf /usr/lib64/LibreOffice/share/fonts/truetype/opens___.ttf
 #LibreOffice-common-7.0.1.2-alt1.0.p9.x86_64
@@ -14,8 +16,7 @@ subst "s|^\(Name: .*\)$|# Converted from original package requires\nRequires:$RE
 # ignore embedded libs
 for i in $BUILDROOT/opt/onlyoffice/desktopeditors/lib* ; do
     di=$(basename $i)
-    echo "Filter out $di ..."
-    subst "1i%filter_from_requires /^$di.*/d" $SPEC
+    filter_from_requires $di
 done
 
 epm assure patchelf || exit

repack.d/sublime-text.sh

@@ -15,8 +15,7 @@ subst "s|^URL:.*|URL: https://www.sublimetext.com|" $SPEC
 subst "s|^Summary:.*|Summary: Sophisticated text editor for code, html and prose|" $SPEC
 subst "s|^License: unknown$|License: Proprietary|" $SPEC
 
-subst "1i%filter_from_requires /^python3(sublime_api)/d" $SPEC
-
+filter_from_requires "python3(sublime_api)"
 
 # move package to /opt
 ROOTDIR=sublime_text

repack.d/teamviewer.sh

@@ -6,6 +6,8 @@ SPEC="$2"
 
 PRODUCTDIR=/opt/teamviewer
 
+. $(dirname $0)/common.sh
+
 if [ "$($DISTRVENDOR -a)" = "x86_64" ] ; then
     # 32 bit
     rm -fv $BUILDROOT/opt/teamviewer/tv_bin/script/libdepend
@@ -52,12 +54,10 @@ rm -rfv $BUILDROOT/opt/teamviewer/tv_bin/script/teamviewerd.sysv
 subst "s|.*/opt/teamviewer/tv_bin/script/teamviewerd.sysv.*||" $SPEC
 
 # see https://bugzilla.altlinux.org/show_bug.cgi?id=39891
-subst '1i%filter_from_requires /^\\/bin\\/ip/d' $SPEC
+filter_from_requires "\\/bin\\/ip"
 
 # ignore embedded libs
-for i in libQt5 ; do
-    subst "1i%filter_from_requires /^$i.*/d" $SPEC
-done
+filter_from_requires libQt5
 
 epm assure patchelf || exit
 for i in $BUILDROOT$PRODUCTDIR/tv_bin/RTlib/{libicui18n.so.*,libicuuc.so.*} ; do

repack.d/vivaldi-snapshot.sh

@@ -23,6 +23,6 @@ use_system_xdg
 
 install_deps
 
-subst "1i%filter_from_requires /.opt.google.chrome.WidevineCdm/d" $SPEC
+filter_from_requires "\\/opt\\/google\\/chrome\\/WidevineCdm"
 
 echo "You also can install chrome via epm play chrome to use WidevineCdm"

repack.d/vivaldi-stable.sh

@@ -23,6 +23,6 @@ use_system_xdg
 
 install_deps
 
-subst "1i%filter_from_requires /.opt.google.chrome.WidevineCdm/d" $SPEC
+filter_from_requires "\\/opt\\/google\\/chrome\\/WidevineCdm"
 
 echo "You also can install chrome via epm play chrome to use WidevineCdm"

repack.d/webex.sh

@@ -6,5 +6,7 @@ SPEC="$2"
 
 PRODUCT=webex
 
+. $(dirname $0)/common.sh
+
 # drop external requires
-subst '1i%filter_from_requires /^libutil.so.*/d' $SPEC
+filter_from_requires libutil.so

repack.d/xnview.sh

 #!/bin/sh -x
 # It will run with two args: buildroot spec
 BUILDROOT="$1"
-
 SPEC="$2"
 
-ln -s /lib64/libbz2.so.1 $BUILDROOT/opt/XnView/lib/libbz2.so.1.0
+. $(dirname $0)/common.sh
 
+ln -s /lib64/libbz2.so.1 $BUILDROOT/opt/XnView/lib/libbz2.so.1.0
 subst "s|%files|%files\n/opt/XnView/lib/libbz2.so.1.0|" $SPEC
 
 #subst '1Requires:bzlib' $SPEC
@@ -13,14 +13,10 @@ subst '1iAutoReq:yes,noperl' $SPEC
 subst '1iAutoProv:no' $SPEC
 
 # ignore embedded libs
-for i in libQt5 libav libcrypto.so libdbus-1.so libicu liblibraw.so libssl.so libswresample libswscale libva libvdpau ; do
-    subst "1i%filter_from_requires /^$i.*/d" $SPEC
-done
+filter_from_requires libQt5 libav libcrypto.so libdbus-1.so libicu liblibraw.so libssl.so libswresample libswscale libva libvdpau
 
 # ignore embedded libs for Plugins
-for i in libHalf.so libIex libIlmThread libwebp ; do
-    subst "1i%filter_from_requires /^$i.*/d" $SPEC
-done
+filter_from_requires libHalf.so libIex libIlmThread libwebp
 
 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