Commit 198bd0d8 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm-repack-rpm: check package name after spec fixing

parent 14fe036a
...@@ -218,12 +218,6 @@ __epm_repack_to_rpm() ...@@ -218,12 +218,6 @@ __epm_repack_to_rpm()
# run generic scripts and repack script for the pkg # run generic scripts and repack script for the pkg
cd $buildroot || fatal cd $buildroot || fatal
if [ -n "$EEPM_INTERNAL_PKGNAME" ] ; then
if ! estrlist contains "$pkgname" "$EEPM_INTERNAL_PKGNAME" ; then
fatal "Some bug: the name of the repacking package ($pkgname) differs with the package name ($EEPM_INTERNAL_PKGNAME) from play.d script."
fi
fi
__fix_spec $pkgname $buildroot $spec __fix_spec $pkgname $buildroot $spec
__apply_fix_code "generic" $buildroot $spec $pkgname $abspkg $SUBGENERIC __apply_fix_code "generic" $buildroot $spec $pkgname $abspkg $SUBGENERIC
__apply_fix_code "generic-$SUBGENERIC" $buildroot $spec $pkgname $abspkg __apply_fix_code "generic-$SUBGENERIC" $buildroot $spec $pkgname $abspkg
...@@ -234,6 +228,15 @@ __epm_repack_to_rpm() ...@@ -234,6 +228,15 @@ __epm_repack_to_rpm()
__fix_spec $pkgname $buildroot $spec __fix_spec $pkgname $buildroot $spec
cd - >/dev/null cd - >/dev/null
# reassign package name (could be renamed in fix scripts)
pkgname="$(grep "^Name: " $spec | sed -e "s|Name: ||g" | head -n1)"
if [ -n "$EEPM_INTERNAL_PKGNAME" ] ; then
if ! estrlist contains "$pkgname" "$EEPM_INTERNAL_PKGNAME" ; then
fatal "Some bug: the name of the repacking package ($pkgname) differs with the package name ($EEPM_INTERNAL_PKGNAME) from play.d script."
fi
fi
TARGETARCH=$(epm print info -a | sed -e 's|^x86$|i586|') TARGETARCH=$(epm print info -a | sed -e 's|^x86$|i586|')
showcmd $RPMBUILD --buildroot $buildroot --target $TARGETARCH -bb $spec showcmd $RPMBUILD --buildroot $buildroot --target $TARGETARCH -bb $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