diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-01 20:01:06 +0200 |
| commit | cd987458557f4163072c33effd4df34e7e8a4288 (patch) | |
| tree | 90cf7aecf9dfd20f03572e6d81f38c3a9cc36120 /redhat/build | |
| parent | fc5d3c8d01e679b569e18b13488363cadb5e1d7f (diff) | |
| parent | 4ed48b596a3124deac51b66df656c57f9f88c4d9 (diff) | |
| download | tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.tar.gz tde-packaging-cd987458557f4163072c33effd4df34e7e8a4288.zip | |
merge
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 | 9 | ||||
| -rwxr-xr-x | redhat/build/get_latest_built_package_filename.sh | 2 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 8 |
4 files changed, 11 insertions, 9 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 7af2065ec..5a8e282b8 100755 --- a/redhat/build/get_installed_package_version.sh +++ b/redhat/build/get_installed_package_version.sh @@ -6,14 +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";; -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_latest_built_package_filename.sh b/redhat/build/get_latest_built_package_filename.sh index 46c664578..b414b8400 100755 --- a/redhat/build/get_latest_built_package_filename.sh +++ b/redhat/build/get_latest_built_package_filename.sh @@ -14,6 +14,8 @@ RPMDIR_NOARCH=${RPMDIR}/noarch RPMDIRS="${RPMDIR_ARCH} ${RPMDIR_NOARCH}" case "${PKGNAME##*/}" in + "tqt3") PKGNAME="libtqt3-mt";; + "tqtinterface") PKGNAME="libtqt4";; "koffice") PKGNAME="koffice-suite";; "tde-i18n") PKGNAME="tde-i18n-French";; esac diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index f60190970..2d9309738 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -13,15 +13,21 @@ 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. case "${PKGNAME}" in - "trinity-"*|"qt3"|"python-qt3"|"esound") PREFIX="";; + "trinity-"*|"qt3"|"python-qt3"|"esound"|"lib"*) PREFIX="";; "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libotr3"|"libtool"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; "curl") PREFIX="trinity-lib";; *) PREFIX="trinity-";; |