Commit 014fadc4 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: drop using fakeroot during repack to rpm

parent c27be858
...@@ -188,7 +188,6 @@ __epm_repack_to_rpm() ...@@ -188,7 +188,6 @@ __epm_repack_to_rpm()
esac esac
# install epm-repack for static (package based) dependencies # install epm-repack for static (package based) dependencies
assure_exists fakeroot || fatal
assure_exists alien || fatal assure_exists alien || fatal
assure_exists /usr/bin/rpmbuild || fatal assure_exists /usr/bin/rpmbuild || fatal
...@@ -250,10 +249,10 @@ __epm_repack_to_rpm() ...@@ -250,10 +249,10 @@ __epm_repack_to_rpm()
cd $tmpbuilddir/ || fatal cd $tmpbuilddir/ || fatal
if [ -n "$verbose" ] ; then if [ -n "$verbose" ] ; then
docmd fakeroot alien --generate --to-rpm $verbose $scripts "../$alpkg" || fatal docmd alien --generate --to-rpm $verbose $scripts "../$alpkg" || fatal
else else
showcmd fakeroot alien --generate --to-rpm $scripts "../$alpkg" showcmd alien --generate --to-rpm $scripts "../$alpkg"
a='' fakeroot alien --generate --to-rpm $scripts "../$alpkg" >/dev/null || fatal a='' alien --generate --to-rpm $scripts "../$alpkg" >/dev/null || fatal
fi fi
local subdir="$(echo *)" local subdir="$(echo *)"
...@@ -275,11 +274,11 @@ __epm_repack_to_rpm() ...@@ -275,11 +274,11 @@ __epm_repack_to_rpm()
__apply_fix_code $pkgname $tmpbuilddir/$subdir $spec __apply_fix_code $pkgname $tmpbuilddir/$subdir $spec
# TODO: we need these dirs to be created # TODO: we need these dirs to be created
to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM" to_remove_pkg_dirs="$to_remove_pkg_dirs $HOME/RPM/BUILD $HOME/RPM"
showcmd fakeroot rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec showcmd rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec
if [ -n "$verbose" ] ; then if [ -n "$verbose" ] ; then
a='' fakeroot rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec || fatal a='' rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec || fatal
else else
a='' fakeroot rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec >/dev/null || fatal a='' rpmbuild --buildroot $tmpbuilddir/$subdir --define='_allow_root_build 1' -bb $spec >/dev/null || fatal
fi fi
# remove copy of source binary package (don't mix with generated) # remove copy of source binary package (don't mix with generated)
rm -f $tmpbuilddir/../$alpkg rm -f $tmpbuilddir/../$alpkg
......
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