[prev in list] [next in list] [prev in thread] [next in thread] 

List:       omd-commits
Subject:    [omd-commits] OMD Git: omd: shinken: use simplejson-2.6.2 for Centos 5.x
From:       git () mathias-kettner ! de (git version control)
Date:       2013-06-01 14:47:40
Message-ID: 20130601144740.52F5E81445 () mail ! mathias-kettner ! de
[Download RAW message or body]

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

Author:   Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sat Jun  1 16:44:38 2013 +0200
Commiter: Gerhard Lausser <gerhard.lausser at consol.de>
Date:     Sat Jun  1 16:44:38 2013 +0200

shinken: use simplejson-2.6.2 for Centos 5.x

---

 packages/shinken/Makefile                |   18 +++++++++++++++---
 packages/shinken/simplejson-2.6.2.tar.gz |  Bin 0 -> 52035 bytes
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/shinken/Makefile b/packages/shinken/Makefile
index 504b285..85e929c 100644
--- a/packages/shinken/Makefile
+++ b/packages/shinken/Makefile
@@ -28,9 +28,21 @@ MP_FILE=$(MP).tar.gz
 MP_URL=http://pypi.python.org/packages/source/m/multiprocessing/$(MP_FILE)
 #
 # Simple JSON (not included in CentOS' python2.4)
-SJSON=simplejson-3.3.0
-SJSON_FILE=$(SJSON).tar.gz
-SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
+ifeq ($(DISTRO_NAME),CENTOS)
+  ifeq ($(DISTRO_VERSION),$(filter $(DISTRO_VERSION),5.4 5.5 5.6 5.7 5.8 5.9))
+    SJSON=simplejson-2.6.2
+    SJSON_FILE=$(SJSON).tar.gz
+    SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
+  else
+    SJSON=simplejson-3.3.0
+    SJSON_FILE=$(SJSON).tar.gz
+    SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
+  endif
+else
+  SJSON=simplejson-3.3.0
+  SJSON_FILE=$(SJSON).tar.gz
+  SJSON_URL=http://pypi.python.org/packages/source/s/simplejson/$(SJSON_FILE)
+endif
 #
 # Setup-Tools (needed to install Pyro on CentOS)
 STOOLS=setuptools-0.6c11
diff --git a/packages/shinken/simplejson-2.6.2.tar.gz b/packages/shinken/simplejson-2.6.2.tar.gz
new file mode 100644
index 0000000..b0fda06
Binary files /dev/null and b/packages/shinken/simplejson-2.6.2.tar.gz differ


[prev in list] [next in list] [prev in thread] [next in thread]