diff options
| author | François Andriot <albator78@libertysurf.fr> | 2018-09-04 21:44:28 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2018-09-04 21:44:28 +0200 |
| commit | 8d17db2e0995db07518fec7e5fd3a568e9da769c (patch) | |
| tree | 8ff3b3ae40b3e2a6bd29ce98b02b896da0bb3647 /redhat/build | |
| parent | ce92126deea3247ae8daddc4427a081ac44504e1 (diff) | |
| download | tde-packaging-8d17db2e0995db07518fec7e5fd3a568e9da769c.tar.gz tde-packaging-8d17db2e0995db07518fec7e5fd3a568e9da769c.zip | |
RPM: update packages for PCLinuxOS 2018
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/configure_repository.sh | 2 | ||||
| -rwxr-xr-x | redhat/build/gather_rpm_sources.sh | 2 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 6 | ||||
| -rwxr-xr-x | redhat/build/get_source_files.sh | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index c40e64b64..d280319f0 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -43,5 +43,5 @@ fi if [ -x "/usr/bin/apt-get" ]; then [ ! -L "${RPMDIR}/RPMS.${ARCH}" ] && ln -sf "${ARCH}" "${RPMDIR}/RPMS.${ARCH}" [ ! -L "${RPMDIR}/RPMS.noarch" ] && ln -sf "noarch" "${RPMDIR}/RPMS.noarch" - echo "rpm file:${RPMDIR%/*} ${RPMDIR##*/} ${ARCH} noarch" >"/etc/apt/sources.list.d/rpmbuild.list" + echo "rpm file:${RPMDIR%/*} ${RPMDIR##*/} ${ARCH} noarch" | sudo tee "/etc/apt/sources.list.d/rpmbuild.list" fi diff --git a/redhat/build/gather_rpm_sources.sh b/redhat/build/gather_rpm_sources.sh index decabea84..98b67cbdc 100755 --- a/redhat/build/gather_rpm_sources.sh +++ b/redhat/build/gather_rpm_sources.sh @@ -6,7 +6,7 @@ PKGNAME="${1%/}" PKGNAME="${PKGNAME##*/}" -TDE_VERSION="${2:-14.0.4}" +TDE_VERSION="${2:-14.0.5}" TARGETDIR="${3:-/tmp/${PKGNAME}-${TDE_VERSION}}" DIST="$4" diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 91b211fd3..2989aebef 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -21,8 +21,6 @@ case "${PKGNAME}" in "trinity-"*) PREFIX="";; # Most TDE dependencies have no prefix "avahi-tqt"|"dbus-tqt"|"dbus-1-tqt"|"libart-lgpl"|"libcaldav"|"libcarddav"|"python-tqt"|"sip4-tqt"|"qt3"|"tqscintilla"|"tqt3"|"tqtinterface"|"tqca"|"tqca-tls") PREFIX="";; - # Most TDE libraries have no prefix - #"libkdcraw") PREFIX="";; # 3rd party dependencies "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"gmime"|"hk_classes"|"intltool"|"lcms"|"mp4v2"|"python-qt3"|"rdesktop"|"recode"|"rdiff-backup"|"sword"|"tar") PREFIX="";; # Extra build stuff @@ -46,7 +44,7 @@ case "${PKGNAME}" in "dbus-tqt") PKGRUNTIME="${lib}dbus-tqt-1-0";; "dbus-1-tqt") PKGRUNTIME="${lib}dbus-1-tqt0";; "digikam") PKGRUNTIME="digikam-i18n";; - "esound") PKGRUNTIME="libesd0";; + "esound") PKGRUNTIME="${lib}esd0";; "imlib1") PKGRUNTIME="${lib}Imlib1";; "knetworkmanager8") PKGRUNTIME="knetworkmanager";; "koffice") PKGRUNTIME="koffice-suite";; @@ -86,7 +84,7 @@ if [ -n "${DEVEL}" ]; then # Some other packags NOT having development package case "${PKGNAME}" in - "autoconf"|"automake"|"cmake"|"cscope"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;; + "autoconf"|"automake"|"cmake"|"cscope"|"gnuchess"|"hal-info"|"lilypond"|"m4"|"mftrace"|"pcsc-perl"|"rdesktop"|"recode"|"rdiff-backup"|"torsocks") exit 0;; "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;; esac diff --git a/redhat/build/get_source_files.sh b/redhat/build/get_source_files.sh index 668a5774c..2e30edc9b 100755 --- a/redhat/build/get_source_files.sh +++ b/redhat/build/get_source_files.sh @@ -1,7 +1,7 @@ #!/bin/bash PKGNAME="${1##*/}" -TDE_VERSION="${2:-14.0.4}" +TDE_VERSION="${2:-14.0.5}" DIST="$3" [ -z "${PKGNAME}" ] && echo "You must specify a package name !" && exit 1 |