diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-01 11:51:45 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-01 11:51:45 +0200 |
| commit | 4ed48b596a3124deac51b66df656c57f9f88c4d9 (patch) | |
| tree | b8aa11c9b7f6e49155454b236915fcaad3ab94a2 /redhat/build | |
| parent | f56924252eb70959bff9d829259b13bbef049458 (diff) | |
| download | tde-packaging-4ed48b596a3124deac51b66df656c57f9f88c4d9.tar.gz tde-packaging-4ed48b596a3124deac51b66df656c57f9f88c4d9.zip | |
RPM Packaging: updates
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/build_rpm_package.sh | 1 | ||||
| -rwxr-xr-x | redhat/build/get_installed_package_version.sh | 11 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 4 |
3 files changed, 6 insertions, 10 deletions
diff --git a/redhat/build/build_rpm_package.sh b/redhat/build/build_rpm_package.sh index d55075ffa..cd8bb1662 100755 --- a/redhat/build/build_rpm_package.sh +++ b/redhat/build/build_rpm_package.sh @@ -38,6 +38,7 @@ rpmbuild -ba \ --define "_buildrootdir ${BUILDROOTDIR}" \ --define "_rpmdir ${RPMDIR}" \ --define "_srcrpmdir ${SRPMDIR}" \ + --define '_build_create_debug 1' \ --define "tde_version ${TDE_VERSION}" \ --define "tde_prefix /opt/trinity" \ --define "preversion ${PREVERSION}" \ diff --git a/redhat/build/get_installed_package_version.sh b/redhat/build/get_installed_package_version.sh index 609c88f0e..5a8e282b8 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -6,16 +6,7 @@ PKGNAME="${1##*/}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 # Language package: install only French language package -case ${PKGNAME} in - "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="trinity-${PKGNAME}-French";; - "koffice") PKGNAME="${PKGNAME}-suite";; - "trinity-"*) PKGNAME="${PKGNAME#trinity-}";; - "qt3") [ -r /etc/mandriva-release ] && PKGNAME="qt3-common";; - "curl") PKGNAME="trinity-libcurl";; - "esound") PKGNAME="esound-libs";; - "tqt3") PKGNAME="libtqt3-mt";; - "tqtinterface") PKGNAME="libtqt4";; -esac +PKGNAME="$(get_rpm_package_name.sh ${PKGNAME})" VERSION=$(LC_ALL=C rpm -q --qf "%{version}-%{release}" trinity-${PKGNAME} 2>/dev/null) if [ -z "${VERSION}" ] || [[ "${VERSION}" =~ "not installed" ]]; then diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 1b3e8b2cb..8c9ac7307 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -13,12 +13,16 @@ PKGCATEGORY="${1%%/*}" PKGNAME="${1##*/}" DEVEL="$2" +# Some RPM packages have different name than the source tarball. # Language package: install only French language package case "${PKGNAME}" in "k3b-i18n"|"koffice-i18n"|"tde-i18n") PKGNAME="${PKGNAME}-French";; "koffice") PKGNAME="${PKGNAME}-suite";; "tqt3") PKGNAME="libtqt3-mt";; "tqtinterface") PKGNAME="libtqt4";; + "avahi-tqt") PKGNAME="libavahi-tqt";; + "dbus-tqt") PKGNAME="libdbus-tqt-1";; + "dbus-1-tqt") PKGNAME="libdbus-1-tqt";; esac # Use the Trinity Prefix, or not. |