diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-06-27 13:52:45 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-06-27 13:52:45 +0200 |
| commit | c04a613301f53ffd04afbcea91569882a9541756 (patch) | |
| tree | e847480a2927f8ddd4a9b930296129fb3359fcaf /redhat/build | |
| parent | 332ffaead4bd07de1dca11c1be5ae4d21c9374e9 (diff) | |
| download | tde-packaging-c04a613301f53ffd04afbcea91569882a9541756.tar.gz tde-packaging-c04a613301f53ffd04afbcea91569882a9541756.zip | |
RPM packaging: update build scripts
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 4 | ||||
| -rwxr-xr-x | redhat/build/get_source_files.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index 7c4609e8a..2071ab445 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -56,8 +56,8 @@ fi if [ -r "${TEMPDIR}/one.patch" ]; then sed -i "${TEMPDIR}/"*.spec \ - -e "/^Source0:/ s/$/\nPatch0: one.patch/" \ - -e "/%setup/ s/$/\n%patch0 -p1/" + -e "/^Source0:/ s/$/\nPatch389: one.patch/" \ + -e "/%setup/ s/$/\n%patch389 -p1/" fi [ -d "${BUILDDIR}" ] || mkdir -p "${BUILDDIR}" diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 03a3598a0..bec678217 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -6,6 +6,7 @@ TDE_VERSION="${2:-14.0.0}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION}) SPECDIR="${SPECFILE%/*}" +RPMPKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" [ ! -r "${SPECFILE}" ] && exit 2 @@ -13,7 +14,7 @@ while read var val; do case "${var}" in Version:*) VERSION="${val}";; Source[0-9]*:|Source:|Patch[0-9]*:) - FILE=$(rpm --define "tde_pkg ${PKGNAME}" --define "tde_version ${TDE_VERSION}" --define "name ${PKGNAME}" --define "version ${VERSION}" -E "${SPECDIR}/${val##*/}") + FILE=$(rpm --define "tde_pkg ${PKGNAME}" --define "tde_version ${TDE_VERSION}" --define "name ${RPMPKGNAME}" --define "version ${VERSION}" -E "${SPECDIR}/${val##*/}") if [ -r "${FILE}" ]; then echo "${FILE}" else |