diff options
author | François Andriot <albator78@libertysurf.fr> | 2018-06-02 14:24:39 +0200 |
---|---|---|
committer | François Andriot <albator78@libertysurf.fr> | 2018-06-19 20:11:02 +0200 |
commit | ce947350eb2ae4260a6476e302fb73ad244fe955 (patch) | |
tree | d4e90d6cc68b11d45d8c45d56134f0f0d7906d80 /redhat/build/build_rpm_package.sh | |
parent | 15e02021e25b2c9a00d7eabaf6b2ffe5238c78b3 (diff) | |
download | tde-packaging-ce947350eb2ae4260a6476e302fb73ad244fe955.tar.gz tde-packaging-ce947350eb2ae4260a6476e302fb73ad244fe955.zip |
RPM: update build scripts
Diffstat (limited to 'redhat/build/build_rpm_package.sh')
-rwxr-xr-x | redhat/build/build_rpm_package.sh | 16 |
1 files changed, 2 insertions, 14 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 1588ff833..b61478d84 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -9,8 +9,6 @@ PKGNAME="${PKGNAME##*/}" TDE_VERSION="${2:-14.0.0}" SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) -SOURCES=$(get_source_files.sh ${PKGNAME} ${TDE_VERSION}) -TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :) VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :) case "${VERSION}" in *~pre*) PREVERSION="${VERSION#*~}";; esac @@ -20,18 +18,8 @@ BUILDDIR="${TMPPATH}/BUILD${DIST}.$(uname -i)" BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)" LOGFILE="${TMPPATH}/log.${COMP##*/}" -TEMPDIR="$(mktemp -d)" -cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TEMPDIR}" - -### Check for patches - -PATCHDIR="${SPECFILE%/*}/patches/${TDE_VERSION}" -if [ -d "${PATCHDIR}" ]; then - cat "${PATCHDIR}/"*".patch" >>"${TEMPDIR}/one.patch" - sed -i "${TEMPDIR}/"*".spec" \ - -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ - -e "/%setup/ s/$/\n%patch389 -p1/" -fi +export TEMPDIR="$(mktemp -d)" +gather_rpm_sources.sh "${PKGNAME}" "${TDE_VERSION}" "${TEMPDIR}" [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" |