diff options
| -rwxr-xr-x | redhat/build/gather_rpm_sources.sh | 12 | ||||
| -rwxr-xr-x | redhat/build/get_source_files.sh | 18 |
2 files changed, 18 insertions, 12 deletions
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index 7961b95be..df6cadc9d 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -32,10 +32,14 @@ cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}" PATCHDIR="${HOME}/tde/patches/${TDE_VERSION}/$1" if [ -d "${PATCHDIR}" ]; then - cat "${PATCHDIR}/"*".patch" "${PATCHDIR}/"*".patch${DIST}" >>"${TARGETDIR}/one.patch" - sed -i "${TARGETDIR}/"*".spec" \ - -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ - -e "/%setup/ s/$/\n%patch389 -p1/" + cat "${PATCHDIR}/"*".patch" "${PATCHDIR}/"*".patch${DIST}" >>"${TARGETDIR}/one.patch" 2>/dev/null + if [ "$(cat "${TARGETDIR}/one.patch" | wc -c)" = 0 ]; then + rm -f "${TARGETDIR}/one.patch" + else + sed -i "${TARGETDIR}/"*".spec" \ + -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ + -e "/%setup/ s/$/\n%patch389 -p1/" + fi fi exit $RET diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index d6c43b0e4..1b0463e4c 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -8,13 +8,12 @@ DIST="$3" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) SPECDIR="${SPECFILE%/*}" RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" - [ ! -r "${SPECFILE}" ] && exit 2 while read var val; do case "${var}" in Version:*) VERSION="${val}";; - Source[0-9]*:|Source:|Patch[0-9]*:) + Source*:|Source:|Patch[0-9]*:) FILE="${SPECDIR}/${val##*/}" if [ "${DIST}" = "any" ] && [ "${var//%\{?dist\}/}" = "${var}" ]; then FILES="${FILE//%\{?dist\}/.}"* @@ -23,12 +22,15 @@ while read var val; do fi for FILE in $FILES; do - file=$(rpm --define "tde_pkg ${PKGNAME}" \ - --define "tde_version ${TDE_VERSION}" \ - --define "name ${RPMPKGNAME}" \ - --define "version ${VERSION}" \ - --define "dist ${DIST:-$(rpm -E %dist)}" \ - -E "${FILE}") + for name in ${RPMPKGNAME} ${PKGNAME} trinity-${PKGNAME}; do + file=$(rpm --define "tde_pkg ${PKGNAME}" \ + --define "tde_version ${TDE_VERSION}" \ + --define "name ${name}" \ + --define "version ${VERSION}" \ + --define "dist ${DIST:-$(rpm -E %dist)}" \ + -E "${FILE}") + [ -r "${file}" ] && break + done [ -r "${file}" ] && echo "${file}" done ;; |