[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

[David GUENAULT]

The following commit has been merged in the debian/master branch:
commit ae34a1ad46ad0c8e1344b580b27193262bfd157d
Author: David GUENAULT <dguenault at monitoring-fr.org>
Date:   Sun Jan 8 10:10:21 2012 +0100

    FIX bad epel-release version

diff --git a/contrib/alternative-installation/shinken-install/shinken.conf b/contrib/alternative-installation/shinken-install/shinken.conf
index c6919c1..dadd8f0 100644
--- a/contrib/alternative-installation/shinken-install/shinken.conf
+++ b/contrib/alternative-installation/shinken-install/shinken.conf
@@ -40,7 +40,6 @@ export GIT="https://github.com/naparuba/shinken.git"
 export ARCH=$(uname -i)
 export DIST=$(/usr/bin/lsb_release -i | awk '{print $NF}')
 export VERS=$(/usr/bin/lsb_release -r | awk '{print $NF}' | awk -F. '{print $1}')
-export EPELVERS="5-4"
 
 case $DIST in 
 	CentOS)
@@ -64,6 +63,12 @@ esac
 
 if [ "$CODE" = "REDHAT" ]
 then
+	if [ "$VERS" = "5" ]
+	then
+		export EPELVERS="5-4"
+	else
+		export EPELVERS="6-5"
+	fi
 	export EPELNAME="epel-release"
 	export EPELPKG="${EPELNAME}-${EPELVERS}.noarch.rpm"
 	export EPEL="http://download.fedoraproject.org/pub/epel/$VERS/$ARCH/$EPELPKG"

-- 
UNNAMED PROJECT