summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam J. Stewart <ajstewart426@gmail.com>2017-04-10 15:09:59 -0500
committerGitHub <noreply@github.com>2017-04-10 15:09:59 -0500
commit462765570450e4306b366b304cac7e1139b65522 (patch)
tree2b09a6d83f0592e3c7beec72e8c67d640b3f7a88
parent4acc36d188b3de16e0200953e352f7952d09abd6 (diff)
downloadspack-462765570450e4306b366b304cac7e1139b65522.tar.gz
spack-462765570450e4306b366b304cac7e1139b65522.tar.bz2
spack-462765570450e4306b366b304cac7e1139b65522.tar.xz
spack-462765570450e4306b366b304cac7e1139b65522.zip
Rename libson-c to json-c, add new version (#3776)
-rw-r--r--var/spack/repos/builtin/packages/flux/package.py2
-rw-r--r--var/spack/repos/builtin/packages/json-c/package.py (renamed from var/spack/repos/builtin/packages/libjson-c/package.py)11
-rw-r--r--var/spack/repos/builtin/packages/libhio/package.py2
3 files changed, 8 insertions, 7 deletions
diff --git a/var/spack/repos/builtin/packages/flux/package.py b/var/spack/repos/builtin/packages/flux/package.py
index c5d61bbc2a..6f368fbef4 100644
--- a/var/spack/repos/builtin/packages/flux/package.py
+++ b/var/spack/repos/builtin/packages/flux/package.py
@@ -44,7 +44,7 @@ class Flux(AutotoolsPackage):
depends_on("hwloc")
depends_on("lua@5.1:5.1.99")
depends_on("munge")
- depends_on("libjson-c")
+ depends_on("json-c")
depends_on("libxslt")
depends_on("python")
depends_on("py-cffi", type=('build', 'run'))
diff --git a/var/spack/repos/builtin/packages/libjson-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py
index 561c8ab71f..d5ec92f2bd 100644
--- a/var/spack/repos/builtin/packages/libjson-c/package.py
+++ b/var/spack/repos/builtin/packages/json-c/package.py
@@ -25,11 +25,12 @@
from spack import *
-class LibjsonC(AutotoolsPackage):
- """ A JSON implementation in C """
+class JsonC(AutotoolsPackage):
+ """A JSON implementation in C."""
homepage = "https://github.com/json-c/json-c/wiki"
- url = "https://s3.amazonaws.com/json-c_releases/releases/json-c-0.11.tar.gz"
+ url = "https://s3.amazonaws.com/json-c_releases/releases/json-c-0.12.1.tar.gz"
- parallel = False
+ version('0.12.1', '55f7853f7d8cf664554ce3fa71bf1c7d')
+ version('0.11', 'aa02367d2f7a830bf1e3376f77881e98')
- version('0.11', 'aa02367d2f7a830bf1e3376f77881e98')
+ parallel = False
diff --git a/var/spack/repos/builtin/packages/libhio/package.py b/var/spack/repos/builtin/packages/libhio/package.py
index 181aca979f..d26811daf7 100644
--- a/var/spack/repos/builtin/packages/libhio/package.py
+++ b/var/spack/repos/builtin/packages/libhio/package.py
@@ -35,6 +35,6 @@ class Libhio(AutotoolsPackage):
version('1.3.0.1', 'c073541de8dd70aeb8878bd00d6d877f')
- depends_on("libjson-c")
+ depends_on("json-c")
depends_on("bzip2")
depends_on("pkg-config", type="build")