From 61dd14b2a40d5c7c5430a9e863a2c50384e6c87e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Sun, 16 Feb 2014 11:56:41 +0100 Subject: RPM Packaging: update R14 packages --- redhat/build/get_installed_package_version.sh | 2 +- redhat/build/install_rpm_package.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'redhat/build') 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-";; -- cgit v1.2.1