epm repack code/codium/draw.io: use add_electron_deps

repack.d/code.sh

@@ -8,14 +8,11 @@ PRODUCT=code
 PRODUCTCUR=vscode
 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
 
-set_autoreq 'yes,nomonolib,nomono'
+add_electron_deps
 
 fix_desktop_file /usr/share/code/code
 

repack.d/codium.sh

@@ -6,18 +6,15 @@ 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
 
-set_autoreq 'yes,nomonolib,nomono'
+add_electron_deps
 
 remove_file /usr/bin/$PRODUCT
 add_bin_link_command
 
 fix_desktop_file /usr/share/codium/codium
 
-#fix_chrome_sandbox
+fix_chrome_sandbox

repack.d/common-chromium-browser.sh

@@ -56,19 +56,6 @@ cleanup()
     remove_file /usr/share/menu/$PRODUCTCUR.menu
 }
 
-add_electron_deps()
-{
-    add_unirequires "file grep sed which xdg-utils xprop"
-    add_unirequires "libpthread.so.0 libstdc++.so.6"
-    add_unirequires "libX11.so.6 libXcomposite.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXrandr.so.2 libxcb.so.1 libxkbcommon.so.0"
-    add_unirequires "libasound.so.2 libatk-1.0.so.0 libatk-bridge-2.0.so.0 libatspi.so.0"
-    add_unirequires "libcairo.so.2 libcups.so.2 libdbus-1.so.3"
-    add_unirequires "libdrm.so.2 libexpat.so.1 libfontconfig.so.1 libgbm.so.1"
-    add_unirequires "libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgtk-3.so.0 libpango-1.0.so.0"
-    add_unirequires "libnspr4.so libnss3.so libnssutil3.so libsmime3.so"
-
-}
-
 add_chromium_deps()
 {
     add_unirequires "file grep sed which xdg-utils xprop"

repack.d/common.sh

@@ -313,6 +313,19 @@ install_requires()
     fi
 }
 
+
+add_electron_deps()
+{
+    add_unirequires "file grep sed which xdg-utils xprop"
+    add_unirequires "libpthread.so.0 libstdc++.so.6"
+    add_unirequires "libX11.so.6 libXcomposite.so.1 libXdamage.so.1 libXext.so.6 libXfixes.so.3 libXrandr.so.2 libxcb.so.1 libxkbcommon.so.0"
+    add_unirequires "libasound.so.2 libatk-1.0.so.0 libatk-bridge-2.0.so.0 libatspi.so.0"
+    add_unirequires "libcairo.so.2 libcups.so.2 libdbus-1.so.3"
+    add_unirequires "libdrm.so.2 libexpat.so.1 libfontconfig.so.1 libgbm.so.1"
+    add_unirequires "libgio-2.0.so.0 libglib-2.0.so.0 libgobject-2.0.so.0 libgtk-3.so.0 libpango-1.0.so.0"
+    add_unirequires "libnspr4.so libnss3.so libnssutil3.so libsmime3.so"
+}
+
 add_by_ldd_deps()
 {
     local exe="$1"

repack.d/draw.io.sh

@@ -17,4 +17,4 @@ fix_desktop_file /opt/drawio/drawio
 
 fix_chrome_sandbox
 
-set_autoreq 'yes'
+add_electron_deps