diff --git a/pack.d/yandex-browser-corporate-codecs-ffmpeg-extra.sh b/pack.d/yandex-browser-corporate-codecs-ffmpeg-extra.sh new file mode 120000 index 0000000000000000000000000000000000000000..f85c0416442cea91edebedbfa82ee6be59caf547 --- /dev/null +++ b/pack.d/yandex-browser-corporate-codecs-ffmpeg-extra.sh @@ -0,0 +1 @@ +yandex-browser-stable-codecs-ffmpeg-extra.sh \ No newline at end of file diff --git a/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh b/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh index d83b324174b39bceb8fae67e88999708826e8f48..a0d2dea0b94da4df5c66c296d945f3693071a0df 100755 --- a/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh +++ b/pack.d/yandex-browser-stable-codecs-ffmpeg-extra.sh @@ -13,6 +13,8 @@ BASEPKGNAME=yandex-browser-stable if echo "$PRODUCT" | grep -q "yandex-browser-beta" ; then BASEPKGNAME=yandex-browser-beta +elif echo "$PRODUCT" | grep -q "yandex-browser-corporate" ; then + BASEPKGNAME=yandex-browser-corporate fi # used in update-ffmpeg diff --git a/play.d/yandex-browser.sh b/play.d/yandex-browser.sh index 49bf5876b617b1f0fade9c8097e0063a2d78ef47..c22f4e20c7ae6af6528f57b28041afebfd6fb29d 100755 --- a/play.d/yandex-browser.sh +++ b/play.d/yandex-browser.sh @@ -2,7 +2,7 @@ BASEPKGNAME=yandex-browser SUPPORTEDARCHES="x86_64" -PRODUCTALT="stable beta" +PRODUCTALT="stable beta corporate" VERSION="$2" DESCRIPTION="Yandex browser from the official site" TIPS="Run 'epm play yandex-browser=beta' to install beta version of the browser." @@ -13,11 +13,15 @@ TIPS="Run 'epm play yandex-browser=beta' to install beta version of the browser. URL="https://repo.yandex.ru/yandex-browser" -if [ "$(epm print info -s)" = "alt" ] || [ "$(epm print info -p)" != "rpm" ] ; then - epm install "$URL/deb/pool/main/y/$PKGNAME/$(epm print constructname $PKGNAME "$VERSION*" amd64 deb)" || exit -else +repack='' +[ "$(epm print info -s)" = "alt" ] && repack='--repack' + +if [ "$(epm print info -p)" = "rpm" ] ; then # https://repo.yandex.ru/yandex-browser/rpm/stable/x86_64/yandex-browser-stable-23.1.1.1114-1.x86_64.rpm - epm install "$URL/rpm/stable/x86_64/$(epm print constructname $PKGNAME "$VERSION*" x86_64 rpm)" || exit + epm install --repack "$URL/rpm/stable/x86_64/$(epm print constructname $PKGNAME "$VERSION*" x86_64 rpm)" || exit +else + # https://repo.yandex.ru/yandex-browser/deb/pool/main/y/yandex-browser-beta/yandex-browser-beta_23.5.4.682-1_amd64.deb + epm install "$URL/deb/pool/main/y/$PKGNAME/$(epm print constructname $PKGNAME "$VERSION*" amd64 deb)" || exit fi UPDATEFFMPEG=$(epm ql $PKGNAME | grep update-ffmpeg) || fatal diff --git a/repack.d/yandex-browser-beta.sh b/repack.d/yandex-browser-beta.sh index 8965b7f2cd1d1cf614f7f7c09c0029d70d11d6b2..a16e7146d68ea1ad22a074447b7fdeae672e4cb3 100755 --- a/repack.d/yandex-browser-beta.sh +++ b/repack.d/yandex-browser-beta.sh @@ -11,6 +11,7 @@ PRODUCTDIR=/opt/yandex/browser-beta . $(dirname $0)/common-chromium-browser.sh subst '1iConflicts: yandex-browser-stable' $SPEC +subst '1iConflicts: yandex-browser-corporate' $SPEC subst "s|^\(Version:.*\)|\1\nProvides: yandex-browser = %version|" $SPEC diff --git a/repack.d/yandex-browser-corporate.sh b/repack.d/yandex-browser-corporate.sh new file mode 100755 index 0000000000000000000000000000000000000000..65310e7b3b619ae137b8aca0b1a4fa4f4154b15f --- /dev/null +++ b/repack.d/yandex-browser-corporate.sh @@ -0,0 +1,34 @@ +#!/bin/sh -x + +# It will be run with two args: buildroot spec +BUILDROOT="$1" +SPEC="$2" + +PRODUCT=yandex-browser +PRODUCTCUR=yandex-browser-corporate +PRODUCTDIR=/opt/yandex/browser + +. $(dirname $0)/common-chromium-browser.sh + +subst '1iConflicts: yandex-browser-stable' $SPEC +subst '1iConflicts: yandex-browser-beta' $SPEC +subst "s|^\(Version:.*\)|\1\nProvides: yandex-browser = %version|" $SPEC + +add_findreq_skiplist $PRODUCTDIR/update-ffmpeg + +# this package can be missed +epm install --skip-installed --no-remove fonts-ttf-google-noto-emoji-color && add_requires fonts-ttf-google-noto-emoji-color + +set_alt_alternatives 65 + +copy_icons_to_share + +cleanup + +add_bin_commands + +use_system_xdg + +add_chromium_deps + +fix_desktop_file /usr/bin/$PRODUCTCUR diff --git a/repack.d/yandex-browser-stable.sh b/repack.d/yandex-browser-stable.sh index 59ef82c0a9b04a9edd1a0f196c973e3a420bed9d..5f633a4b833a63e7b79b862f5a0892edfa368630 100755 --- a/repack.d/yandex-browser-stable.sh +++ b/repack.d/yandex-browser-stable.sh @@ -11,6 +11,7 @@ PRODUCTDIR=/opt/yandex/browser . $(dirname $0)/common-chromium-browser.sh subst '1iConflicts: yandex-browser-beta' $SPEC +subst '1iConflicts: yandex-browser-corporate' $SPEC subst "s|^\(Version:.*\)|\1\nProvides: yandex-browser = %version|" $SPEC add_findreq_skiplist $PRODUCTDIR/update-ffmpeg