summaryrefslogtreecommitdiffstats
path: root/redhat/build
diff options
context:
space:
mode:
authorMichele Calgaro <michele.calgaro@yahoo.it>2014-02-16 21:12:46 +0900
committerMichele Calgaro <michele.calgaro@yahoo.it>2014-02-16 21:12:46 +0900
commit5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3 (patch)
treee5ed8e0ef8b269e375cc5ae3d0514e815fe54f22 /redhat/build
parent74d6c6f82a27fc3ca51abe188461657782af75b1 (diff)
parent47f97be766d32c908a39d4dc10dc555af69c82dd (diff)
downloadtde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.tar.gz
tde-packaging-5bde4cde9b86bd2b8d30aa308fa8a4c8287412d3.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/build')
-rwxr-xr-xredhat/build/get_installed_package_version.sh2
-rwxr-xr-xredhat/build/install_rpm_package.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh
index fa2ff5cf9..62dbb1ff0 100755
--- a/redhat/build/get_installed_package_version.sh
+++ b/redhat/build/get_installed_package_version.sh
@@ -12,7 +12,7 @@ case ${PKGNAME} in
"trinity-"*) PKGNAME="${PKGNAME#trinity-}";;
"qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";;
"curl") PKGNAME="trinity-libcurl";;
- "esound") PKGNAME="$(rpm -E %_lib)esound";;
+ "esound") PKGNAME="esound-libs";;
esac
VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null)
diff --git a/redhat/build/install_rpm_package.sh b/redhat/build/install_rpm_package.sh
index 13daa1258..19e2d4c4e 100755
--- a/redhat/build/install_rpm_package.sh
+++ b/redhat/build/install_rpm_package.sh
@@ -27,7 +27,7 @@ esac
# Trinity Prefix, or not.
case "${PKGNAME}" in
- "trinity-"*|"qt3"|"python-qt3") PREFIX="";;
+ "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";;
"gnuchess"|"imlib1"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";;
"curl") PREFIX="trinity-lib";;
*) PREFIX="trinity-";;