From 7a982322a83902d7126029e1f423fe32ab3a9f63 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Wed, 25 Jan 2012 20:25:45 +0100 Subject: [PATCH] pck-update: remove SPEC_OBSOLETES_ESCAPED Signed-off-by: Davide Madrisan --- ChangeLog | 4 ++++ lib/libspec.lib.in | 2 +- plugins/pck-update.in | 8 ++++---- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 976b288..4f7ce2c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -41,6 +41,10 @@ Changes in version 1.9.1 Obsoletes: pck1 <= [,] pck2 > (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 diff --git a/lib/libspec.lib.in b/lib/libspec.lib.in index 3ffb2f0..c1d36a7 100644 --- a/lib/libspec.lib.in +++ b/lib/libspec.lib.in @@ -1103,7 +1103,7 @@ $FUNCNAME: * entry found at line $linenum: \"${tok[*]}\"" ",") skiptok="0"; continue ;; esac tok_pck="$(rpmvars.solve "$currtok" "$specfile")" - SPEC_OBSOLETES[${#SPEC_OBSOLETES[*]}]="\"$currtok\"" + SPEC_OBSOLETES[${#SPEC_OBSOLETES[*]}]="$currtok" notify.debug "\ $FUNCNAME: SPEC_OBSOLETES = ( ${SPEC_OBSOLETES[*]} )" done diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 419d939..d25252a 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -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_BUILDROOT" ] || specfile.getvars -s $SPECFILE_PREPROCESSED SPEC_BUILDROOT - # escape '<' and '>' characters - SPEC_OBSOLETES_ESCAPED=`echo "${SPEC_OBSOLETES[*]}" | sed "s|<|\<|;s|>|\>|"` - echo "\ SPEC_NAME=\"$SPEC_NAME\" SPEC_VERSION=\"$SPEC_VERSION\" @@ -506,7 +503,10 @@ $(for i in `seq 1 1 ${#SPEC_LICENSE[*]}`; do echo -n "\"${SPEC_LICENSE[i-1]}\" " done)) 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_BUILDROOT=\"$SPEC_BUILDROOT\" SPEC_BUILDREQUIRES=(\