diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-12 01:00:33 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-12 01:00:33 +0200 |
| commit | 8ef20fb122dcf4a0b12aa09ec0263d88940c700a (patch) | |
| tree | 5de5f3e758b5499265cb99718343a5ce2f2db245 /redhat/build | |
| parent | 3b208c4d6f5300319984fb31881fca6b7afd55a8 (diff) | |
| download | tde-packaging-8ef20fb122dcf4a0b12aa09ec0263d88940c700a.tar.gz tde-packaging-8ef20fb122dcf4a0b12aa09ec0263d88940c700a.zip | |
RPM Packaging: update 3.5.13.2 packages
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 5 | ||||
| -rwxr-xr-x | redhat/build/get_latest_built_package_filename.sh | 8 |
2 files changed, 2 insertions, 11 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 9d8611dee..9aae43d36 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -44,11 +44,6 @@ if [ -r "${TEMPDIR}/one.patch" ]; then -e "/%setup/ s/$/\n%patch0 -p1/" fi -# Determines if we are running an i386 or x86_64 distro -if [ "$(rpm -q --qf '%{arch}\n' kernel | tail -n 1)" = "i686" ]; then - ARGS="${ARGS} --target=i686" -fi - [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" diff --git a/redhat/build/get_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index b414b8400..ccbb0acf0 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -5,12 +5,8 @@ PKGNAME="$1" TDE_VERSION="${2:-14.0.0}" RPMDIR="$(rpm -E %{_rpmdir}.tde-${TDE_VERSION})" -if [ $(uname -i) == "x86_64" ]; then - RPMDIR_ARCH=${RPMDIR}/x86_64 -else - RPMDIR_ARCH=${RPMDIR}/i?86 -fi -RPMDIR_NOARCH=${RPMDIR}/noarch +RPMDIR_ARCH="${RPMDIR}/$(rpm -E %_target_cpu)" +RPMDIR_NOARCH="${RPMDIR}/noarch" RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}" case "${PKGNAME##*/}" in |