Commit 85eae62d authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack librewolf: fix repacking

parent 585cc474
...@@ -156,6 +156,7 @@ __epm_addrepo_altlinux_url() ...@@ -156,6 +156,7 @@ __epm_addrepo_altlinux_url()
local res='' local res=''
for arch in $(get_archlist) ; do for arch in $(get_archlist) ; do
local rd="$(eget --list $url/$arch/RPMS.*)" local rd="$(eget --list $url/$arch/RPMS.*)"
# TODO: fix URL support!
[ -d "$rd" ] || continue [ -d "$rd" ] || continue
local REPO_NAME="$(echo "$rd" | sed -e 's|.*\.||')" local REPO_NAME="$(echo "$rd" | sed -e 's|.*\.||')"
docmd epm repo add "rpm $url $arch $REPO_NAME" docmd epm repo add "rpm $url $arch $REPO_NAME"
......
...@@ -109,7 +109,7 @@ __epm_pack() ...@@ -109,7 +109,7 @@ __epm_pack()
mv -v $pkgnames $EPMCURDIR || fatal mv -v $pkgnames $EPMCURDIR || fatal
local i local i
for i in $pkgnames ; do for i in "$returntarname" ; do
[ -r "$i.eepm.yaml" ] && mv -v "$i.eepm.yaml" $EPMCURDIR [ -r "$i.eepm.yaml" ] && mv -v "$i.eepm.yaml" $EPMCURDIR
done done
......
...@@ -26,4 +26,4 @@ esac ...@@ -26,4 +26,4 @@ esac
PKGURL=$(epm tool eget --list --latest https://github.com/cucumber-sp/yandex-music-linux/releases "yandex-music_${VERSION}_${arch}.deb") PKGURL=$(epm tool eget --list --latest https://github.com/cucumber-sp/yandex-music-linux/releases "yandex-music_${VERSION}_${arch}.deb")
epm install --repack $PKGURL epm install $PKGURL
...@@ -83,7 +83,7 @@ subst "s|^\(Version: .*\)~.*|\1|" $SPEC ...@@ -83,7 +83,7 @@ subst "s|^\(Version: .*\)~.*|\1|" $SPEC
subst "s|^Release: |Release: epm1.repacked.|" $SPEC subst "s|^Release: |Release: epm1.repacked.|" $SPEC
set_rpm_field "Distribution" "EEPM" set_rpm_field "Distribution" "EEPM"
# TODO: check the yaml file!!!
if [ -r "$PKG.eepm.yaml" ] ; then if [ -r "$PKG.eepm.yaml" ] ; then
eval $(epm tool yaml $PKG.eepm.yaml | grep -E '(summary|description|upstream_file|upstream_url|url|appname|arches|group|license|version)=' ) #' eval $(epm tool yaml $PKG.eepm.yaml | grep -E '(summary|description|upstream_file|upstream_url|url|appname|arches|group|license|version)=' ) #'
# for tarballs fix permissions # for tarballs fix permissions
......
...@@ -12,15 +12,5 @@ fix_desktop_file "/usr/share/$PRODUCT/$PRODUCT" ...@@ -12,15 +12,5 @@ fix_desktop_file "/usr/share/$PRODUCT/$PRODUCT"
add_libs_requires add_libs_requires
rm -f $BUILDROOT/usr/bin/librewolf rm usr/bin/librewolf
add_bin_link_command add_bin_link_command
if epm assure patchelf ; then
for i in $BUILDROOT/$PRODUCTDIR/{lib*.so,plugin-container} ; do
a= patchelf --set-rpath '$ORIGIN/' $i || continue
done
for i in $BUILDROOT/$PRODUCTDIR/gmp-clearkey/0.1/lib*.so ; do
a= patchelf --set-rpath '$ORIGIN/../../' $i || continue
done
fi
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