Accepting request 798586 from home:polslinux:branches:devel:libraries:c_c++

- json-c 0.14:
  * bits.h has been removed
  * lh_abort() has been removed
  * lh_table_lookup() has been removed, use lh_table_lookup_ex() instead.
  * Remove TRUE and FALSE defines, use 1 and 0 instead.
  * Switch to cmake
  * Build fixes
  * Doc updates
  * Added a json_tokener_get_parse_end() function to replace
    direct access of tok->char_offset
  * json_tokener_parse_ex() now accepts a new JSON_TOKENER_VALIDATE_UTF8 flag
    to validate that input is UTF8
  * Add support for unsigned 64-bit integers
  * A total of 7 new functions were added:
    * json_object_get_uint64 ( struct json_object const* jso )
    * json_object_new_uint64 ( uint64_t i )
    * json_object_set_uint64 ( struct json_object* jso, uint64_t new_value )
    * json_parse_uint64 ( char const* buf, uint64_t* retval )
        * See description of uint64 support, above.
    * json_tokener_get_parse_end ( struct json_tokener* tok )
        * See details under "json_tokener changes", above.
    * json_object_from_fd_ex ( int fd, int in_depth )
        * Allows the max nesting depth to be specified.
    * json_object_new_null ( )
        * Simply returns NULL.  Its use is not recommended.
  * The size of struct json_object has decreased from 96 bytes to 88 bytes.

OBS-URL: https://build.opensuse.org/request/show/798586
OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/json-c?expand=0&rev=33

baselibs.conf

@@ -1 +1 @@
-libjson-c4
+libjson-c5

json-c-0.13.1.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:b87e608d4d3f7bfdd36ef78d56d53c74e66ab278d318b71e6002a369d36f4873
-size 639425

json-c-0.14.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b377de08c9b23ca3b37d9a9828107dff1de5ce208ff4ebb35005a794f30c6870
+size 321677

json-c.changes

@@ -1,3 +1,33 @@
+-------------------------------------------------------------------
+Tue Apr 28 07:45:45 UTC 2020 - Paolo Stivanin <info@paolostivanin.com>
+
+- json-c 0.14:
+  * bits.h has been removed
+  * lh_abort() has been removed
+  * lh_table_lookup() has been removed, use lh_table_lookup_ex() instead.
+  * Remove TRUE and FALSE defines, use 1 and 0 instead.
+  * Switch to cmake
+  * Build fixes
+  * Doc updates
+  * Added a json_tokener_get_parse_end() function to replace
+    direct access of tok->char_offset
+  * json_tokener_parse_ex() now accepts a new JSON_TOKENER_VALIDATE_UTF8 flag
+    to validate that input is UTF8
+  * Add support for unsigned 64-bit integers
+  * A total of 7 new functions were added:
+    * json_object_get_uint64 ( struct json_object const* jso )
+    * json_object_new_uint64 ( uint64_t i )
+    * json_object_set_uint64 ( struct json_object* jso, uint64_t new_value )
+    * json_parse_uint64 ( char const* buf, uint64_t* retval )
+        * See description of uint64 support, above.
+    * json_tokener_get_parse_end ( struct json_tokener* tok )
+        * See details under "json_tokener changes", above.
+    * json_object_from_fd_ex ( int fd, int in_depth )
+        * Allows the max nesting depth to be specified.
+    * json_object_new_null ( )
+        * Simply returns NULL.  Its use is not recommended.
+  * The size of struct json_object has decreased from 96 bytes to 88 bytes.
+
 -------------------------------------------------------------------
 Tue Mar 13 01:21:57 UTC 2018 - avindra@opensuse.org
 

json-c.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package json-c
 #
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -12,23 +12,24 @@
 # license that conforms to the Open Source Definition (Version 1.9)
 # published by the Open Source Initiative.
 
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
+# Please submit bugfixes or comments via https://bugs.opensuse.org/
 #
 
 
 %define libname libjson-c
-%define libsoname %{libname}4
+%define libsoname %{libname}5
 %define oldlibname libjson
 Name:           json-c
-Version:        0.13.1
+Version:        0.14
 Release:        0
 Summary:        JSON implementation in C
 License:        MIT
 Group:          Development/Libraries/C and C++
-Url:            https://github.com/json-c/json-c/wiki
+URL:            https://github.com/json-c/json-c/wiki
 #Git-Clone	git://github.com/json-c/json-c
 Source0:        https://s3.amazonaws.com/json-c_releases/releases/%{name}-%{version}.tar.gz
 Source1:        baselibs.conf
+BuildRequires:  cmake
 BuildRequires:  fdupes
 BuildRequires:  libtool
 BuildRequires:  pkgconfig
@@ -92,14 +93,19 @@ This package includes the json-c documentation.
 sed -i 's/-Werror //g' Makefile.am.inc
 autoreconf -fiv
 %endif
-%configure --disable-static --with-pic --disable-oldname-compat
-make %{?_smp_mflags}
+%cmake \
+    -DCMAKE_BUILD_TYPE=None \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=%{_libdir} \
+    -DENABLE_THREADING=ON \
+    -DENABLE_RDRAND=ON
 
 %check
-make %{?_smp_mflags} check
+export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
+%ctest
 
 %install
-%make_install
+%cmake_install
 find %{buildroot} -type f -name "*.la" -delete -print
 # create a compatibilty pkg-config file for software needing it
 (cd %{buildroot}%{_libdir}/pkgconfig && ln -s json-c.pc json.pc)
@@ -118,6 +124,10 @@ cp -R doc/html "%{buildroot}%{_docdir}/%{name}-doc"
 %{_libdir}/%{libname}.so
 %{_includedir}/json-c
 %{_libdir}/pkgconfig/*.pc
+%dir %{_libdir}/cmake/json-c
+%{_libdir}/cmake/json-c/json-c-config.cmake
+%{_libdir}/cmake/json-c/json-c-targets-none.cmake
+%{_libdir}/cmake/json-c/json-c-targets.cmake
 
 %files -n %{libname}-doc
 %license COPYING