diff options
| author | François Andriot <[email protected]> | 2014-11-09 12:54:35 +0100 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2014-11-09 12:54:35 +0100 |
| commit | a3bdc3b32bcb585ff9786e727bd8d47917ba3c10 (patch) | |
| tree | 5da21e4e0bdcc029a5b4a0cf4ae26ff4d300f5e1 /redhat/build | |
| parent | e25e5dfb46bcbb9327349620eca4da0a9538bf0d (diff) | |
| download | tde-packaging-a3bdc3b32bcb585ff9786e727bd8d47917ba3c10.tar.gz tde-packaging-a3bdc3b32bcb585ff9786e727bd8d47917ba3c10.zip | |
RPM packaging: update build scripts
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/configure_repository.sh | 6 | ||||
| -rwxr-xr-x | redhat/build/get_latest_tarball_filename.sh | 4 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 5 | ||||
| -rwxr-xr-x | redhat/build/get_specfile.sh | 6 |
4 files changed, 15 insertions, 6 deletions
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 22ddaf4f7..18c91eb1a 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -28,3 +28,9 @@ if [ -x /usr/sbin/urpmi ]; then sudo urpmi.addmedia rpmbuild.${ARCH} ${RPMDIR}/${ARCH} sudo urpmi.addmedia rpmbuild.noarch ${RPMDIR}/noarch fi + +# openSUSE +if [ -x /usr/bin/zypper ]; then + sudo zypper ar -G ${RPMDIR}/${ARCH} rpmbuild.${ARCH} + sudo zypper ar -G ${RPMDIR}/noarch rpmbuild.noarch +fi diff --git a/redhat/build/get_latest_tarball_filename.sh b/redhat/build/get_latest_tarball_filename.sh index e4c58d2b6..3cdeb904d 100755 --- a/redhat/build/get_latest_tarball_filename.sh +++ b/redhat/build/get_latest_tarball_filename.sh @@ -5,12 +5,12 @@ TDE_VERSION="${2:-14.0.0}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 [ -d "${TARBALLS_DIR}" ] || TARBALLS_DIR=~/tde/tde-tarballs/${TDE_VERSION}/ -[ -d "${PACKAGING_DIR}" ] || PACKAGING_DIR=~/tde/tde-packaging +[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging [ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat/ RET=$(find "${TARBALLS_DIR}" -name "trinity-${PKGNAME}-[0-9]*.tar.gz" | sort -n | tail -n 1) if [ -z "${RET}" ]; then - RET=$(find "${TARBALLS_DIR}/../extras/" -name "${PKGNAME}-[0-9]*.tar.*" | sort -n | tail -n 1) + RET=$(find "${TARBALLS_DIR}/../extras/" -name "${PKGNAME}[-_][0-9]*.tar.*" | sort -n | tail -n 1) fi if [ ! -r "${RET}" ]; then # Retry without 'trinity-*', and allow any TAR extension. diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 8d73e2572..520da9e6a 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -20,7 +20,7 @@ case "${PKGNAME}" in # In case prefix is already there, don't add it again. "trinity-"*) PREFIX="";; # Most TDE dependencies have no prefix - "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcarddav"|"libcaldav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface") PREFIX="";; + "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcarddav"|"libcaldav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; # 3rd party dependencies "esound"|"fileshareset"|"hk_classes"|"python-qt3") PREFIX="";; # Extra build stuff @@ -49,6 +49,8 @@ case "${PKGNAME}" in "libcaldav") PKGRUNTIME="${lib}caldav0";; "libcarddav") PKGRUNTIME="${lib}carddav0";; "tqscintilla") PKGRUNTIME="${lib}tqscintilla7";; + "tqca") PKGRUNTIME="${lib}tqca1";; + "tqca-tls") PKGRUNTIME="${lib}tqt3-mt-tqca-tls";; "tqt3") PKGRUNTIME="${lib}tqt3-mt";; "tqtinterface") PKGRUNTIME="${lib}tqt4";; # Language package: install only French language package @@ -86,6 +88,7 @@ if [ -n "${DEVEL}" ]; then "libart-lgpl") PKGDEVEL="libart_lgpl-devel";; "libcaldav") PKGDEVEL="${lib}caldav-devel";; "libcarddav") PKGDEVEL="${lib}carddav-devel";; + "tqca") PKGDEVEL="${lib}tqca-devel";; "tqscintilla") PKGDEVEL="${lib}tqscintilla-devel";; "tqt3") PKGDEVEL="tqt3-dev-tools tqt3-apps-devel tqt3-compat-headers";; # Default case: development package has same name as runtime package, plus '-devel' suffix. diff --git a/redhat/build/get_specfile.sh b/redhat/build/get_specfile.sh index ac59434a7..70ff8d144 100755 --- a/redhat/build/get_specfile.sh +++ b/redhat/build/get_specfile.sh @@ -5,14 +5,14 @@ TDE_VERSION="${2:-14.0.0}" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 -[ -d "${PACKAGING_DIR}" ] || PACKAGING_DIR=~/tde/tde-packaging +[ -d "${TDE_PACKAGING_DIR}" ] || TDE_PACKAGING_DIR=~/tde/tde-packaging [ -d "${DIST_PACKAGING_DIR}" ] || DIST_PACKAGING_DIR=${PACKAGING_DIR}/redhat # Special case for QT3 if [ "${PKGNAME}" = "qt3" ]; then case "$(rpmdist.sh --dist)" in - .oss*) DIST_PACKAGING_DIR=${PACKAGING_DIR}/opensuse ;; - .mga*|.mdk*|.pclos*) DIST_PACKAGING_DIR=${PACKAGING_DIR}/mageia ;; + .oss*) DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/opensuse ;; + .mga*|.mdk*|.pclos*) DIST_PACKAGING_DIR=${TDE_PACKAGING_DIR}/mageia ;; esac fi |