From 47864a912b26acfd0a5c4c0a8be6bfd8df892dd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= <albator78@libertysurf.fr>
Date: Tue, 1 Oct 2013 19:01:20 +0200
Subject: RPM Packaging: update R14 packages

---
 redhat/buildall-r14.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'redhat/buildall-r14.sh')

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
-- 
cgit v1.2.3