Commit 6a272229 authored by Vitaly Lipatov's avatar Vitaly Lipatov

epm repack: skip ALT only macros using when epm-rpm-build is used

parent c486c113
......@@ -117,6 +117,7 @@ __epm_repack_to_rpm()
if [ -x $RPMBUILD ] ; then
warning "will use eepm-rpmbuild for rpm packing"
export EPM_RPMBUILD=$RPMBUILD
else
RPMBUILD=/usr/bin/rpmbuild
# TODO: check for all systems
......
......@@ -399,6 +399,8 @@ add_by_ldd_deps()
filter_from_requires()
{
# hack for uncompatible rpm-build
[ -n "$EPM_RPMBUILD" ] && return
local i
for i in "$@" ; do
local ti="$(echo "$i" | sed -e 's|^/|\\\\/|' -e 's|\([^\]\)/|\1\\\\/|g')"
......@@ -408,6 +410,8 @@ filter_from_requires()
add_findreq_skiplist()
{
# hack for uncompatible rpm-build
[ -n "$EPM_RPMBUILD" ] && return
local i
for i in "$@" ; do
subst "1i%add_findreq_skiplist $i" $SPEC
......
......@@ -32,7 +32,7 @@ find $BUILDROOT -name "*.py" | grep -q "\.py$" && flag_python3=1
find $BUILDROOT -name "*.py" -exec sed -i -e '1{/python3/n};1i#!/usr/bin/python3' {} \;
if [ -n "$flag_python3" ] ; then
if [ "$(epm print info -s)" = "alt" ] ; then
if [ "$(epm print info -s)" = "alt" ] && [ -z "$EPM_RPMBUILD" ] ; then
epm install --skip-installed rpm-build-python3
subst "1i%add_python3_lib_path /usr" $SPEC
# by some unknown reason there are no packages provide that (https://github.com/Etersoft/eepm/issues/22)
......
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