[omd-commits] OMD Git: omd: shinken: adjust centos 5 hacks to new version string

git version control git at mathias-kettner.de
Thu Mar 12 22:30:02 CET 2015


Module:   omd
Branch:   master
Commit:   c8214ba4728b897a08174de935968dd26e3739fd
URL:      http://omdistro.org/projects/omd/repository/revisions/c8214ba4728b897a08174de935968dd26e3739fd

Author:   Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Mar 12 17:51:48 2015 +0100
Commiter: Sven Nierlein <Sven.Nierlein at consol.de>
Date:     Thu Mar 12 21:31:28 2015 +0100

shinken: adjust centos 5 hacks to new version string

---

 packages/shinken/Makefile |   15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index d8a97f8..4da14fa 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -7,7 +7,7 @@ SHINKEN_URL=http://shinken-monitoring.org/pub/$(SHINKEN).tar.gz
 #
 # Python Remote Objects
 ifeq ($(DISTRO_NAME),CENTOS)
-  ifeq ($(DISTRO_VERSION),$(filter $(DISTRO_VERSION),5.4 5.5 5.6 5.7 5.8 5.9 5.10))
+  ifeq ($(DISTRO_VERSION),5)
     PYRO=Pyro-3.12
     PYRO_FILE=$(PYRO).tar.gz
     PYRO_URL=https://pypi.python.org/packages/source/P/Pyro/$(PYRO_FILE)
@@ -29,7 +29,7 @@ MP_URL=http://pypi.python.org/packages/source/m/multiprocessing/$(MP_FILE)
 #
 # Simple JSON (not included in CentOS' python2.4)
 ifeq ($(DISTRO_NAME),CENTOS)
-  ifeq ($(DISTRO_VERSION),$(filter $(DISTRO_VERSION),5.4 5.5 5.6 5.7 5.8 5.9 5.10))
+  ifeq ($(DISTRO_VERSION),5)
     SJSON=simplejson-2.1.2
   else
     SJSON=simplejson-3.3.0
@@ -65,7 +65,7 @@ MONGODB_URL=http://fastdl.mongodb.org/linux/$(MONGODB_FILE)
 #
 # Python bindings for MongoDB
 ifeq ($(DISTRO_NAME),CENTOS)
-  ifeq ($(DISTRO_VERSION),$(filter $(DISTRO_VERSION),5.4 5.5 5.6 5.7 5.8 5.9 5.10))
+  ifeq ($(DISTRO_VERSION),5)
     PYMONGO=pymongo-2.1.1
   else
     PYMONGO=pymongo-2.5.2
@@ -119,14 +119,7 @@ build:
 	tar xzf $(HASHLIB_FILE)
 	#test -f $(SQLITE_FILE) || wget $(SQLITE_URL)
 	#tar xzf $(SQLITE_FILE)
-	if [ $(DISTRO_NAME) = "CENTOS" ] && [ \
-		$(DISTRO_VERSION) = "5.4" -o \
-		$(DISTRO_VERSION) = "5.5" -o \
-		$(DISTRO_VERSION) = "5.6" -o\
-		$(DISTRO_VERSION) = "5.7" -o \
-		$(DISTRO_VERSION) = "5.8" -o \
-		$(DISTRO_VERSION) = "5.9" -o \
-		$(DISTRO_VERSION) = "5.10" ]; then \
+	if [ $(DISTRO_NAME) = "CENTOS" ] && [ $(DISTRO_VERSION) = "5" ]; then \
 		echo it is a centos 5; \
 		echo which has python 2.4; \
 		echo we need to remove the shinken webui; \



More information about the omd-commits mailing list