From 462765570450e4306b366b304cac7e1139b65522 Mon Sep 17 00:00:00 2001 From: "Adam J. Stewart" Date: Mon, 10 Apr 2017 15:09:59 -0500 Subject: Rename libson-c to json-c, add new version (#3776) --- var/spack/repos/builtin/packages/flux/package.py | 2 +- var/spack/repos/builtin/packages/json-c/package.py | 36 ++++++++++++++++++++++ var/spack/repos/builtin/packages/libhio/package.py | 2 +- .../repos/builtin/packages/libjson-c/package.py | 35 --------------------- 4 files changed, 38 insertions(+), 37 deletions(-) create mode 100644 var/spack/repos/builtin/packages/json-c/package.py delete mode 100644 var/spack/repos/builtin/packages/libjson-c/package.py 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/json-c/package.py b/var/spack/repos/builtin/packages/json-c/package.py new file mode 100644 index 0000000000..d5ec92f2bd --- /dev/null +++ b/var/spack/repos/builtin/packages/json-c/package.py @@ -0,0 +1,36 @@ +############################################################################## +# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. +# Produced at the Lawrence Livermore National Laboratory. +# +# This file is part of Spack. +# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. +# LLNL-CODE-647188 +# +# For details, see https://github.com/llnl/spack +# Please also see the LICENSE file for our notice and the LGPL. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License (as +# published by the Free Software Foundation) version 2.1, February 1999. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and +# conditions of the GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +############################################################################## +from spack import * + + +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.12.1.tar.gz" + + version('0.12.1', '55f7853f7d8cf664554ce3fa71bf1c7d') + 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") diff --git a/var/spack/repos/builtin/packages/libjson-c/package.py b/var/spack/repos/builtin/packages/libjson-c/package.py deleted file mode 100644 index 561c8ab71f..0000000000 --- a/var/spack/repos/builtin/packages/libjson-c/package.py +++ /dev/null @@ -1,35 +0,0 @@ -############################################################################## -# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC. -# Produced at the Lawrence Livermore National Laboratory. -# -# This file is part of Spack. -# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved. -# LLNL-CODE-647188 -# -# For details, see https://github.com/llnl/spack -# Please also see the LICENSE file for our notice and the LGPL. -# -# This program is free software; you can redistribute it and/or modify -# it under the terms of the GNU Lesser General Public License (as -# published by the Free Software Foundation) version 2.1, February 1999. -# -# This program is distributed in the hope that it will be useful, but -# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and -# conditions of the GNU Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -############################################################################## -from spack import * - - -class LibjsonC(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" - - parallel = False - - version('0.11', 'aa02367d2f7a830bf1e3376f77881e98') -- cgit v1.2.3-70-g09d2