Commit 5de00bdc authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm play anydesk: force get 6.1.* packages, fix repack

parent fd8ffde8
...@@ -28,11 +28,12 @@ repack='' ...@@ -28,11 +28,12 @@ repack=''
# https://download.anydesk.com/deb/anydesk_6.0.1-1_amd64.deb # https://download.anydesk.com/deb/anydesk_6.0.1-1_amd64.deb
# general msk # general msk
PKGMASK="$($DISTRVENDOR -p)/$(epm print constructname $PKGNAME "*" $arch '' '_')" #PKGMASK="$($DISTRVENDOR -p)/$(epm print constructname $PKGNAME "*" $arch '' '_')"
PKGMASK="$(epm print constructname $PKGNAME "6.1*" $arch '' '_')"
# we miss obsoleted libpangox on ALT, so use RHEL8 build # we miss obsoleted libpangox on ALT, so use RHEL8 build
# lib.req: WARNING: /usr/bin/anydesk: library libpangox-1.0.so.0 not found # lib.req: WARNING: /usr/bin/anydesk: library libpangox-1.0.so.0 not found
[ "$($DISTRVENDOR -s)" = "alt" ] && PKGMASK="os-specific/rhel8/$(epm print constructname $PKGNAME "*" $arch)" #[ "$($DISTRVENDOR -s)" = "alt" ] && PKGMASK="os-specific/rhel8/$(epm print constructname $PKGNAME "*" $arch)"
PKG="$($EGET --list --latest https://download.anydesk.com/linux $PKGMASK)" || fatal "Can't get package URL" PKG="$($EGET --list --latest https://download.anydesk.com/linux $PKGMASK)" || fatal "Can't get package URL"
......
...@@ -6,6 +6,8 @@ SPEC="$2" ...@@ -6,6 +6,8 @@ SPEC="$2"
PRODUCT=anydesk PRODUCT=anydesk
. $(dirname $0)/common.sh
#mkdir -p $BUILDROOT/etc/systemd/system/ #mkdir -p $BUILDROOT/etc/systemd/system/
#mv -fv $BUILDROOT/usr/share/anydesk/files/systemd/anydesk.service $BUILDROOT/etc/systemd/system/anydesk.service #mv -fv $BUILDROOT/usr/share/anydesk/files/systemd/anydesk.service $BUILDROOT/etc/systemd/system/anydesk.service
#subst "s|/usr/share/anydesk/files/systemd/anydesk.service|/etc/systemd/system/anydesk.service|g" $SPEC #subst "s|/usr/share/anydesk/files/systemd/anydesk.service|/etc/systemd/system/anydesk.service|g" $SPEC
...@@ -21,19 +23,33 @@ epm install --skip-installed fontconfig glib2 libatk libcairo libfreetype libgdk ...@@ -21,19 +23,33 @@ epm install --skip-installed fontconfig glib2 libatk libcairo libfreetype libgdk
subst '1iAutoProv:no' $SPEC subst '1iAutoProv:no' $SPEC
# preloaded from /usr/lib64/anydesk/, drop external requires remove_file usr/share/anydesk/files/init/anydesk
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 # put service file to the normal place
subst '1i%filter_from_requires /^libgtkglext-x11-1.0.so.0.*/d' $SPEC mkdir -p $BUILDROOT/etc/systemd/system/
cp $BUILDROOT/usr/share/anydesk/files/systemd/anydesk.service $BUILDROOT/etc/systemd/system/anydesk.service
remove_file /usr/share/anydesk/files/systemd/anydesk.service
pack_file /etc/systemd/system/anydesk.service
LIBDIR=/usr/lib64 LIBDIR=/usr/lib64
[ -d $BUILDROOT$LIBDIR ] || LIBDIR=/usr/lib [ -d $BUILDROOT$LIBDIR ] || LIBDIR=/usr/lib
# don't check lib if missed
[ ! -d $BUILDROOT$LIBDIR ] && exit
epm assure patchelf || exit epm assure patchelf || exit
for i in $BUILDROOT$LIBDIR/anydesk/{libgdkglext-x11-1.0.*,libgtkglext-x11-1.0.*} ; do for i in $BUILDROOT$LIBDIR/anydesk/{libgdkglext-x11-1.0.*,libgtkglext-x11-1.0.*} ; do
a= patchelf --set-rpath '$ORIGIN/' $i a= patchelf --set-rpath '$ORIGIN/' $i
done done
# /usr/libexec/anydesk: library libpangox-1.0.so.0 not found # /usr/libexec/anydesk: library libpangox-1.0.so.0 not found
for i in $BUILDROOT/usr/libexec/anydesk ; do for i in $BUILDROOT/usr/libexec/anydesk ; do
a= patchelf --set-rpath "$LIBDIR/anydesk" $i a= patchelf --set-rpath "$LIBDIR/anydesk" $i
done 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
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment