diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-10-01 19:01:20 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-10-01 19:01:20 +0200 |
| commit | 47864a912b26acfd0a5c4c0a8be6bfd8df892dd8 (patch) | |
| tree | b80b79bb3b4577ad29f6afab2d0b3620575dccc0 /redhat/buildall-r14.sh | |
| parent | 3b0463ff4659724866ad4a1316e77b68ce365708 (diff) | |
| download | tde-packaging-47864a912b26acfd0a5c4c0a8be6bfd8df892dd8.tar.gz tde-packaging-47864a912b26acfd0a5c4c0a8be6bfd8df892dd8.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/buildall-r14.sh')
| -rwxr-xr-x | redhat/buildall-r14.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/redhat/buildall-r14.sh b/redhat/buildall-r14.sh index 72a98a317..ab7efd63f 100755 --- a/redhat/buildall-r14.sh +++ b/redhat/buildall-r14.sh @@ -135,10 +135,10 @@ grpiui tdeutils if ! is_installed trinity-desktop; then grpiu extras/trinity-desktop eval ${PKGINST} trinity-desktop || exit 1 - # Disable trinity repository from here !!! - if [ -r "/etc/yum.repos.d/trinity-3.5.13.repo" ]; then - sed -i "/etc/yum.repos.d/trinity-3.5.13.repo" -e "s|enabled=.*|enabled=0|g" - fi +fi +# Disable trinity repository from here !!! +if [ -r "/etc/yum.repos.d/trinity.repo" ]; then + sudo sed -i "/etc/yum.repos.d/trinity.repo" -e "s|enabled=.*|enabled=0|g" fi # devel packages @@ -152,7 +152,7 @@ fi # Extra libraries ## IMLIB1: required for kuickshow -if ! is_installed imlib1-devel; then +if ! is_installed imlib1-devel && ! is_installed imlib-devel; then grpiu 3rdparty/imlib1 eval ${PKGINST} imlib1-devel || exit 1 fi |