diff options
| author | François Andriot <albator78@libertysurf.fr> | 2017-08-02 17:19:39 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2017-08-02 17:19:39 +0200 |
| commit | df20fa92cb84771b6c0a3a0f3fa79af383f80d4d (patch) | |
| tree | de5c9c98c8da31f46872604da5497bc1871c64bd /redhat/build | |
| parent | fafb41251ffab1087bd69f1a8a4232c0651075b0 (diff) | |
| download | tde-packaging-df20fa92cb84771b6c0a3a0f3fa79af383f80d4d.tar.gz tde-packaging-df20fa92cb84771b6c0a3a0f3fa79af383f80d4d.zip | |
RPM: update build scripts for PCLinuxOS 2017
Diffstat (limited to 'redhat/build')
| -rwxr-xr-x | redhat/build/configure_repository.sh | 18 | ||||
| -rwxr-xr-x | redhat/build/get_rpm_package_name.sh | 4 |
2 files changed, 15 insertions, 7 deletions
diff --git a/redhat/build/configure_repository.sh b/redhat/build/configure_repository.sh index 27dad6125..c40e64b64 100755 --- a/redhat/build/configure_repository.sh +++ b/redhat/build/configure_repository.sh @@ -4,6 +4,9 @@ TDE_VERSION=${1:-14.0.0} ARCH=$(rpm -E %_target_cpu) RPMDIR=$(rpm -E %{_rpmdir}.tde-${TDE_VERSION}) +[ -d "${RPMDIR}/noarch" ] || mkdir -p "${RPMDIR}/noarch" +[ -d "${RPMDIR}/${ARCH}" ] || mkdir -p "${RPMDIR}/${ARCH}" + # RHEL / CentOS / Fedora if [ -x /usr/bin/yum ]; then cat <<EOF >/tmp/rpmbuild-tde.repo @@ -23,17 +26,22 @@ EOF fi # Mageia / Mandriva -if [ -x /usr/sbin/urpmi ]; then +if [ -x "/usr/sbin/urpmi" ]; then sudo urpmi.removemedia -y "rpmbuild" - sudo urpmi.addmedia rpmbuild.${ARCH} ${RPMDIR}/${ARCH} - sudo urpmi.addmedia rpmbuild.noarch ${RPMDIR}/noarch + sudo urpmi.addmedia "rpmbuild.${ARCH}" "${RPMDIR}/${ARCH}" + sudo urpmi.addmedia "rpmbuild.noarch" "${RPMDIR}/noarch" fi # openSUSE if [ -x /usr/bin/zypper ]; then sudo rm -f "/etc/zypp/repos.d/rpmbuild"* - sudo zypper ar -G ${RPMDIR}/${ARCH} rpmbuild.${ARCH} - sudo zypper ar -G ${RPMDIR}/noarch rpmbuild.noarch + sudo zypper ar -G "${RPMDIR}/${ARCH}" "rpmbuild.${ARCH}" + sudo zypper ar -G "${RPMDIR}/noarch" "rpmbuild.noarch" fi # PCLOS +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" +fi diff --git a/redhat/build/get_rpm_package_name.sh b/redhat/build/get_rpm_package_name.sh index 4167b8f2a..3fa65ebcb 100755 --- a/redhat/build/get_rpm_package_name.sh +++ b/redhat/build/get_rpm_package_name.sh @@ -24,7 +24,7 @@ case "${PKGNAME}" in # Most TDE libraries have no prefix #"libkdcraw") PREFIX="";; # 3rd party dependencies - "dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"mp4v2"|"python-qt3"|"tar") PREFIX="";; + "cscope"|"dirmngr"|"esound"|"exempi"|"file"|"fileshareset"|"hk_classes"|"lcms"|"mp4v2"|"python-qt3"|"rdiff-backup"|"tar") PREFIX="";; # Extra build stuff "autoconf"|"automake"|"cmake"|"gnuchess"|"htdig"|"imlib1"|"libconfig"|"libotr3"|"libr"|"libtool2"|"lilypond"|"m4"|"mftrace"|"pan"|"pcsc-perl"|"torsocks"|"wv2") PREFIX="";; # Other @@ -85,7 +85,7 @@ if [ -n "${DEVEL}" ]; then # Some other packags NOT having development package case "${PKGNAME}" in - "cmake"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"torsocks") exit 0;; + "cmake"|"cscope"|"hal-info"|"lilypond"|"mftrace"|"pcsc-perl"|"rdiff-backup"|"torsocks") exit 0;; "tqca-tls"|"tdeadmin"|"tdetoys"|"tde-i18n"*|"tdeaddons"|"tdeartwork"|"libtqt-perl"|"kipi-plugins") exit 0;; esac |