summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/gather_rpm_sources.sh3
-rwxr-xr-xredhat/build/get_rpm_package_name.sh4
2 files changed, 5 insertions, 2 deletions
diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh
index fb9499e4f..decabea84 100755
--- a/redhat/build/gather_rpm_sources.sh
+++ b/redhat/build/gather_rpm_sources.sh
@@ -11,6 +11,8 @@ TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}"
DIST="$4"
SPECFILE=$(get_specfile.sh ${PKGNAME} ${TDE_VERSION})
+[ -z "${SPECFILE}" ] && exit 1
+
SOURCES=$(get_source_files.sh ${PKGNAME} ${TDE_VERSION} ${DIST})
TARBALL=$(get_latest_tarball_filename.sh ${PKGNAME} ${TDE_VERSION} || :)
VERSION=$(get_latest_tarball_version.sh ${PKGNAME} ${TDE_VERSION} || :)
@@ -23,6 +25,7 @@ BUILDROOTDIR="${TMPPATH}/BUILDROOT${DIST}.$(uname -i)"
LOGFILE="${TMPPATH}/log.${COMP##*/}"
mkdir -p "${TARGETDIR}"
+rm -f "${TARGETDIR}/"*
cp -f ${SPECFILE} ${SOURCES} ${TARBALL} "${TARGETDIR}"
diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh
index 5b7ee0b3b..91b211fd3 100755
--- a/redhat/build/get_rpm_package_name.sh
+++ b/redhat/build/get_rpm_package_name.sh
@@ -46,7 +46,7 @@ case "${PKGNAME}" in
"dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";;
"dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";;
"digikam") PKGRUNTIME="digikam-i18n";;
- "esound") PKGRUNTIME="esound-libs";;
+ "esound") PKGRUNTIME="libesd0";;
"imlib1") PKGRUNTIME="${lib}Imlib1";;
"knetworkmanager8") PKGRUNTIME="knetworkmanager";;
"koffice") PKGRUNTIME="koffice-suite";;
@@ -95,7 +95,7 @@ if [ -n "${DEVEL}" ]; then
"avahi-tqt") PKGDEVEL="libavahi-tqt-devel";;
"dbus-tqt") PKGDEVEL="libdbus-tqt-1-devel";;
"dbus-1-tqt") PKGDEVEL="libdbus-1-tqt-devel";;
- "esound") PKGDEVEL="esound-devel";;
+ "esound") PKGDEVEL="libesd-devel";;
"imlib1") PKGDEVEL="${lib}Imlib-devel";;
"koffice") PKGDEVEL="koffice-devel";;
"lcms") PKGDEVEL="liblcms-devel";;