Commit cd8b4962 authored by Vitaly Lipatov's avatar Vitaly Lipatov

fixes for spec with full path

parent 0007f66b
...@@ -26,7 +26,7 @@ BASERELEASE=$(get_numrelease $SPECNAME) ...@@ -26,7 +26,7 @@ BASERELEASE=$(get_numrelease $SPECNAME)
FIXPATCHFUZZ="%define _default_patch_fuzz 3" FIXPATCHFUZZ="%define _default_patch_fuzz 3"
echo "Converting spec $SPECNAME to $MDISTR..." echo "Converting spec $(basename $SPECNAME) to $MDISTR..."
# Set buildreq # Set buildreq
if [ "$VENDOR" = "alt" ] ; then if [ "$VENDOR" = "alt" ] ; then
......
...@@ -268,11 +268,12 @@ CHECK_OPTIONS="" ...@@ -268,11 +268,12 @@ CHECK_OPTIONS=""
test -n "$NOCHECK" || sisyphus_check $CHECK_OPTIONS --files $LISTBUILT || fatal "sisyphus check failed" test -n "$NOCHECK" || sisyphus_check $CHECK_OPTIONS --files $LISTBUILT || fatal "sisyphus check failed"
echog "OK" echog "OK"
# rpm's find-req do not find rpmlint :) # rpm's find-req do not find rpmlint :)
RPMLINT=rpmlint RPMLINT=rpmlint
if which $RPMLINT >/dev/null ; then if which $RPMLINT >/dev/null ; then
echog -n "Checking with rpmlint..." echog -n "Checking with rpmlint..."
echo echo
$RPMLINT $LISTBUILT $RPMLINT $LISTBUILT
else else
echog "It is recommended to install rpmlint package for additional checking" echog "It is recommended to install rpmlint package for additional checking"
......
...@@ -24,7 +24,7 @@ uni_rpmbuild() ...@@ -24,7 +24,7 @@ uni_rpmbuild()
COMMIT="--commit" COMMIT="--commit"
fi fi
local SPECNAME=$1 local SPECNAME="$1"
local SPECDIR=`dirname $SPECNAME` local SPECDIR=`dirname $SPECNAME`
local GEAR=gear local GEAR=gear
...@@ -49,7 +49,9 @@ uni_rpmbuild() ...@@ -49,7 +49,9 @@ uni_rpmbuild()
[ -f "$SPECNAME" ] || fatal "run uni_rpmbuild with spec as 2nd parameter" [ -f "$SPECNAME" ] || fatal "run uni_rpmbuild with spec as 2nd parameter"
shift # skip spec name shift # skip spec name
#[ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir (SPECDIR='$SPECDIR')" #[ -n "$SPECDIR" ] && [ "$SPECDIR" != "." ] && warning "Spec is not in git dir (SPECDIR='$SPECDIR')"
ALTGEARRULESFILE=.gear/rules-${SPECNAME/.spec/} # FIXME: use spec name as project name
BASESPECNAME=$(basename "$SPECNAME")
ALTGEARRULESFILE=.gear/rules-${BASESPECNAME/.spec/}
ALTGEARRULES=$(git rev-parse --git-dir)/../$ALTGEARRULESFILE ALTGEARRULES=$(git rev-parse --git-dir)/../$ALTGEARRULESFILE
GEARRULES= GEARRULES=
if [ -r "$ALTGEARRULES" ] ; then if [ -r "$ALTGEARRULES" ] ; then
......
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