From ccad8ac783b71b9cda161cf0226c03570e6f2b6e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B6rn=20Esser?= <besser82@fedoraproject.org>
Date: Tue, 21 Apr 2020 19:41:43 +0200
Subject: [PATCH] Update to 0.14

---
 json-c-0.14-dont_install_config_h.patch | 23 +++++++++++++++++++
 json-c.spec                             | 30 ++++++++++++-------------
 sources                                 |  2 +-
 3 files changed, 38 insertions(+), 17 deletions(-)
 create mode 100644 json-c-0.14-dont_install_config_h.patch

diff --git a/json-c-0.14-dont_install_config_h.patch b/json-c-0.14-dont_install_config_h.patch
new file mode 100644
index 0000000..aaa7984
--- /dev/null
+++ b/json-c-0.14-dont_install_config_h.patch
@@ -0,0 +1,23 @@
+From 228881c8fc287182f284a58d8279a32fbeae0b7f Mon Sep 17 00:00:00 2001
+From: Eric Haszlakiewicz <erh+git@nimenees.com>
+Date: Tue, 21 Apr 2020 01:13:21 +0000
+Subject: [PATCH] Issue #585: don't install config.h
+
+(cherry picked from commit 8b511c402b73d1d8b195991891c8d44859cb57ec)
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index ba692fff69..c51f477c5f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -299,7 +299,7 @@ if ($ENV{VALGRIND})
+ endif()
+ 
+ set(JSON_C_PUBLIC_HEADERS
+-    ${PROJECT_BINARY_DIR}/config.h
++    # Note: config.h is _not_ included here
+     ${PROJECT_BINARY_DIR}/json_config.h
+ 
+     ${PROJECT_SOURCE_DIR}/json.h
diff --git a/json-c.spec b/json-c.spec
index 85e773a..3206b69 100644
--- a/json-c.spec
+++ b/json-c.spec
@@ -1,24 +1,23 @@
 %{!?_pkgdocdir:%global _pkgdocdir %{_docdir}/%{name}-%{version}}
 
 # We don't want accidental SONAME bumps.
-%global so_ver 4
+%global so_ver 5
 
-
-# Use 'commit' for snapshots and 'tag' for releases.
-%global commit   a9114392b4d8a3f3a9923625842376a11988245c
-#global tag      json-c-0.13.1-20180305
-%global forgeurl https://github.com/json-c/json-c
-%forgemeta
+# Releases are tagged with a date stamp.
+%global reldate 20200419
 
 
 Name:           json-c
-Version:        0.13.99
-Release:        0.4%{?dist}
+Version:        0.14
+Release:        1%{?dist}
 Summary:        JSON implementation in C
 
 License:        MIT
-URL:            %{forgeurl}
-Source0:        %{forgesource}
+URL:            https://github.com/%{name}/%{name}
+Source0:        %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz
+
+# Cherry-picked from upstream.
+Patch0001:      %{url}/commit/228881c8fc287182f284a58d8279a32fbeae0b7f.patch#/%{name}-0.14-dont_install_config_h.patch
 
 BuildRequires:  cmake
 BuildRequires:  gcc
@@ -55,7 +54,7 @@ This package contains the reference manual for %{name}.
 
 
 %prep
-%forgeautosetup -p 1
+%autosetup -n %{name}-%{name}-%{version}-%{reldate} -p 1
 
 
 %build
@@ -75,10 +74,6 @@ mkdir -p %{_vpath_builddir}
 %install
 %make_install -C %{_vpath_builddir}
 
-# The config.h header file is not needed, and
-# may be the cause for undesired trouble.
-rm -f %{buildroot}%{_includedir}/%{name}/config.h
-
 # Documentation
 mkdir -p %{buildroot}%{_pkgdocdir}
 cp -a %{_vpath_builddir}/doc/html ChangeLog README README.* \
@@ -118,6 +113,9 @@ popd
 
 
 %changelog
+* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-1
+- Update to 0.14
+
 * Mon Apr 20 2020 Björn Esser <besser82@fedoraproject.org> - 0.13.99-0.4.20200416gita911439
 - Remove config.h file from installation
 - Drop hardlinking of the documentation files
diff --git a/sources b/sources
index 0b4e2f3..502d96a 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (json-c-a9114392b4d8a3f3a9923625842376a11988245c.tar.gz) = 3486d54c8708b2ea72a11eef0b7178d64e6474896a00cf75e69750432bc602cd4f434a51f598ba1a418909efa9d8b52d0337934dd5aef36f4adc97a4bec57aa9
+SHA512 (json-c-0.14-20200419.tar.gz) = c2fadbe7ccee29a5628830390aa0c43da3d37854bb086e45face280b8f1f27a1da3785d74ecf059e192ce8cf41c2d2cb7cb262cdfff7a725b196423414c4240f