Skip to content

E
etersoft-build-utils
Commit f66198ca authored by Vitaly Lipatov's avatar Vitaly Lipatov
Browse files
Options

rearrange var VENDOR using

parent b3007b4c
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
bin/rpmbph
View file @ f66198ca
...@@ -14,7 +14,6 @@ ...@@ -14,7 +14,6 @@
. `dirname $0`/../share/eterbuild/functions/common . `dirname $0`/../share/eterbuild/functions/common
load_mod repl rpm load_mod repl rpm
#VENDORVERSION=`distr_vendor -e`
DISTRVERSION=`distr_vendor -v` DISTRVERSION=`distr_vendor -v`
alt_tolocal() alt_tolocal()
...@@ -200,8 +199,7 @@ if [ "$VENDOR" = "alt" ] ; then ...@@ -200,8 +199,7 @@ if [ "$VENDOR" = "alt" ] ; then
else else
subst "1i# This spec is autoported from ALT Linux Sisyphus to `distr_vendor -d` $DISTRVERSION automatically by rpmbph script. Do not edit it." $SPECNAME subst "1i# This spec is autoported from ALT Linux Sisyphus to `distr_vendor -d` $DISTRVERSION automatically by rpmbph script. Do not edit it." $SPECNAME
ENTRY="- autoport to `distr_vendor -d` $DISTRVERSION (by rpmbph script)" ENTRY="- autoport to `distr_vendor -d` $DISTRVERSION (by rpmbph script)"
#DISTRARG="--define '_vendor $VENDOR'" export USE_VENDOR=$RPMVENDOR
export USE_VENDOR=$VENDOR
DISTRARG="" DISTRARG=""
fi fi
...@@ -265,9 +263,6 @@ if [ "$VENDOR" = "alt" ] ; then ...@@ -265,9 +263,6 @@ if [ "$VENDOR" = "alt" ] ; then
MDISTR=$MENV MDISTR=$MENV
test -z "$MDISTR" && fatal "missed backport version (f.i. run with -M24 param for Master 2.4)" test -z "$MDISTR" && fatal "missed backport version (f.i. run with -M24 param for Master 2.4)"
DISTRVERSION=$(get_altdistr_version $MDISTR) DISTRVERSION=$(get_altdistr_version $MDISTR)
# read man bash QUOTING and see /bin/shell-quote (libshell)
# due incompatible changes scince rpm-4.0.4-alt94 (15 Jun 2008)
#LISTRPMARGS="$LISTRPMARGS --define='_source_payload w9.gzdio'"
else else
MDISTR=LOCAL MDISTR=LOCAL
fi fi
......
share/eterbuild/functions/common
View file @ f66198ca
...@@ -96,6 +96,7 @@ local DISTRNAME=`distr_vendor -e` ...@@ -96,6 +96,7 @@ local DISTRNAME=`distr_vendor -e`
MENVARG="" MENVARG=""
TARGET=`distr_vendor -p` TARGET=`distr_vendor -p`
VENDOR=`distr_vendor -s` VENDOR=`distr_vendor -s`
RPMVENDOR=`distr_vendor -n`
if [ "$VENDOR" = "alt" ] && [ -n "$MENV" ] ; then if [ "$VENDOR" = "alt" ] && [ -n "$MENV" ] ; then
[ -n "$APTCONF" ] || APTCONF=${APTCONFBASE/.SS}.$MENV [ -n "$APTCONF" ] || APTCONF=${APTCONFBASE/.SS}.$MENV
......
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