diff --git a/ChangeLog b/ChangeLog index b7f7d18..8442cf0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -17,6 +17,11 @@ Changes in version 1.9.2 * pck-update - Davide Madrisan: Action 6: fix for /lib/ld-linux.so.2 -> ld-2.14.1.so + * pck-update - Davide Madrisan: + Honour `%_specdir' and `%_sourcedir' when checking for syntax errors in the + specfiles by running `rpm -q --specfile --specedit ...'. + (Problem detected by Silvan Calarco). + -------------------------------------------------------------------------------- Changes in version 1.9.1 diff --git a/plugins/pck-update.in b/plugins/pck-update.in index 07307ad..ba0951a 100644 --- a/plugins/pck-update.in +++ b/plugins/pck-update.in @@ -442,13 +442,17 @@ done)" local tmpspreprerr=$(mktemp -q -t $me.XXXXXXXX) [ $? -eq 0 ] || notify.error $"can't create temporary files" notify.debug "tmpspreprerr = \`${NOTE}$tmpspreprerr${NORM}'" - - notify.debug "running: \ -rpm -q $USER_RPMDEFINE_OPTS --specfile --specedit $SRPM_SPECFILE_WITH_PATH ..." + + local rpmbuild_opts="\ +--define=\"%_specdir $spec_dir\" --define=\"%_sourcedir $source_dir\"" + + notify.debug "running: rpm -q $rpmbuild_opts $USER_RPMDEFINE_OPTS \ +--specfile --specedit $SRPM_SPECFILE_WITH_PATH ..." eval "\ -rpm -q $USER_RPMDEFINE_OPTS --specfile --specedit $SRPM_SPECFILE_WITH_PATH \ - 2> $tmpspreprerr >> $specfile_preprocessed" +rpm -q $rpmbuild_opts $USER_RPMDEFINE_OPTS --specfile --specedit\ + $SRPM_SPECFILE_WITH_PATH \ + 2> $tmpspreprerr >> $specfile_preprocessed" [ -s "$tmpspreprerr" ] && { notify.error $"specfile has errors:""\n$(\ while read line; do echo " $line"; done < $tmpspreprerr)"; }