Commit f5311f89 authored by Vitaly Lipatov's avatar Vitaly Lipatov

drop extra requires

parent ff216f8d
......@@ -246,7 +246,8 @@ __epm_repack_to_rpm()
SUBGENERIC='appimage'
./$alpkg --appimage-extract || fatal
alpkg=$PKGNAME-$VERSION.tar
erc a $alpkg squashfs-root
assure_exists erc || fatal
a= erc a $alpkg squashfs-root
else
VERSION="$(echo "$alpkg" | grep -o -P "[-_.]([0-9])([0-9])*(\.[0-9])*" | head -n1 | sed -e 's|^[-_.]||')" #"
if [ -n "$VERSION" ] ; then
......
......@@ -44,7 +44,7 @@ See detailed description here: http://wiki.etersoft.ru/EPM
Summary: Etersoft EPM package manager (repack requirements)
Group: System/Configuration/Packaging
Requires: %name = %EVR
Requires: fakeroot alien dpkg patchelf
Requires: erc alien dpkg patchelf
Requires: /usr/bin/rpmbuild
%description repack
......
......@@ -19,8 +19,8 @@ PKGNAME=vivaldi-$BRANCH-codecs-ffmpeg-extra
VIVALDI_VERSION=$(epm print version for package vivaldi-stable) || fatal
# used in update-ffmpeg
epm install --skip-installed tar binutils || exit
epm assure awk gawk || exit
# install ffmpeg extra codecs
pack_ffmpeg() {
......@@ -36,14 +36,14 @@ pack_ffmpeg() {
# download ffmpeg with upstream script update-ffmpeg but with our pack_ffmpeg function
[ -s $PRODUCTDIR/update-ffmpeg ] || fatal "$PRODUCTDIR/update-ffmpeg is missed"
SC=$(mktemp)
awk 'BEGIN{desk=0}{ if(/^.*--system.*/&&desk==0){desk++} ; if (desk==0) {print} }' < $PRODUCTDIR/update-ffmpeg > $SC
a='' awk 'BEGIN{desk=0}{ if(/^.*--system.*/&&desk==0){desk++} ; if (desk==0) {print} }' < $PRODUCTDIR/update-ffmpeg > $SC
. $SC
DDIR=$(mktemp -d)
cd $DDIR || fatal
$EGET $FFMPEG_URL_DEB
SUITABLE_URLS=$FFMPEG_URL_DEB
ar -x *.deb
tar xf "data.tar.xz"
a='' ar -x *.deb
a='' tar xf "data.tar.xz"
pack_ffmpeg
rm -rf $DDIR
rm -f $SC
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