pck-update: remove SPEC_OBSOLETES_ESCAPED
Signed-off-by: Davide Madrisan <davide.madrisan@gmail.com>
This commit is contained in:
parent
f086d23cce
commit
7a982322a8
@ -41,6 +41,10 @@ Changes in version 1.9.1
|
|||||||
Obsoletes: pck1 <= <v1>[,] pck2 > <v2>
|
Obsoletes: pck1 <= <v1>[,] pck2 > <v2>
|
||||||
(Bug discovered by Silvan Calarco)
|
(Bug discovered by Silvan Calarco)
|
||||||
|
|
||||||
|
+ update
|
||||||
|
* pck-update - Davide Madrisan:
|
||||||
|
Remove SPEC_OBSOLETES_ESCAPED; it's no more required.
|
||||||
|
|
||||||
--------------------------------------------------------------------------------
|
--------------------------------------------------------------------------------
|
||||||
|
|
||||||
Changes in version 1.9.0 - Silvan Birthday Release
|
Changes in version 1.9.0 - Silvan Birthday Release
|
||||||
|
@ -1103,7 +1103,7 @@ $FUNCNAME: * entry found at line $linenum: \"${tok[*]}\""
|
|||||||
",") skiptok="0"; continue ;;
|
",") skiptok="0"; continue ;;
|
||||||
esac
|
esac
|
||||||
tok_pck="$(rpmvars.solve "$currtok" "$specfile")"
|
tok_pck="$(rpmvars.solve "$currtok" "$specfile")"
|
||||||
SPEC_OBSOLETES[${#SPEC_OBSOLETES[*]}]="\"$currtok\""
|
SPEC_OBSOLETES[${#SPEC_OBSOLETES[*]}]="$currtok"
|
||||||
notify.debug "\
|
notify.debug "\
|
||||||
$FUNCNAME: SPEC_OBSOLETES = ( ${SPEC_OBSOLETES[*]} )"
|
$FUNCNAME: SPEC_OBSOLETES = ( ${SPEC_OBSOLETES[*]} )"
|
||||||
done
|
done
|
||||||
|
@ -486,9 +486,6 @@ rpm -q $USER_RPMDEFINE_OPTS --specfile --specedit $SRPM_SPECFILE_WITH_PATH \
|
|||||||
[ "$SPEC_BUILDREQUIRES" ] || specfile.getvars -s $SPECFILE_PREPROCESSED SPEC_BUILDREQUIRES
|
[ "$SPEC_BUILDREQUIRES" ] || specfile.getvars -s $SPECFILE_PREPROCESSED SPEC_BUILDREQUIRES
|
||||||
[ "$SPEC_BUILDROOT" ] || specfile.getvars -s $SPECFILE_PREPROCESSED SPEC_BUILDROOT
|
[ "$SPEC_BUILDROOT" ] || specfile.getvars -s $SPECFILE_PREPROCESSED SPEC_BUILDROOT
|
||||||
|
|
||||||
# escape '<' and '>' characters
|
|
||||||
SPEC_OBSOLETES_ESCAPED=`echo "${SPEC_OBSOLETES[*]}" | sed "s|<|\<|;s|>|\>|"`
|
|
||||||
|
|
||||||
echo "\
|
echo "\
|
||||||
SPEC_NAME=\"$SPEC_NAME\"
|
SPEC_NAME=\"$SPEC_NAME\"
|
||||||
SPEC_VERSION=\"$SPEC_VERSION\"
|
SPEC_VERSION=\"$SPEC_VERSION\"
|
||||||
@ -506,7 +503,10 @@ $(for i in `seq 1 1 ${#SPEC_LICENSE[*]}`; do
|
|||||||
echo -n "\"${SPEC_LICENSE[i-1]}\" "
|
echo -n "\"${SPEC_LICENSE[i-1]}\" "
|
||||||
done))
|
done))
|
||||||
SPEC_TARGET=(${SPEC_TARGET[*]})
|
SPEC_TARGET=(${SPEC_TARGET[*]})
|
||||||
SPEC_OBSOLETES=(${SPEC_OBSOLETES_ESCAPED[*]})
|
SPEC_OBSOLETES=(\
|
||||||
|
$(for i in `seq 1 1 ${#SPEC_OBSOLETES[*]}`; do
|
||||||
|
echo -n "\"${SPEC_OBSOLETES[i-1]}\" "
|
||||||
|
done))
|
||||||
SPEC_BUILDARCH=\"$SPEC_BUILDARCH\"
|
SPEC_BUILDARCH=\"$SPEC_BUILDARCH\"
|
||||||
SPEC_BUILDROOT=\"$SPEC_BUILDROOT\"
|
SPEC_BUILDROOT=\"$SPEC_BUILDROOT\"
|
||||||
SPEC_BUILDREQUIRES=(\
|
SPEC_BUILDREQUIRES=(\
|
||||||
|
Loading…
Reference in New Issue
Block a user