From c8272e3f177f87ea34fac44b88997cf196c413e4 Mon Sep 17 00:00:00 2001
From: MSVSphere Packaging Team <packager@msvsphere-os.ru>
Date: Fri, 8 Nov 2024 00:45:29 +0300
Subject: [PATCH] import json-c-0.18-3.el10

---
 .gitignore        |  2 +-
 .json-c.metadata  |  2 +-
 SPECS/json-c.spec | 24 ++++++++++++++++++------
 3 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index f18a9bf..27b6a6e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/json-c-0.17-20230812.tar.gz
+SOURCES/json-c-0.18-20240915.tar.gz
diff --git a/.json-c.metadata b/.json-c.metadata
index fb5212f..d97a292 100644
--- a/.json-c.metadata
+++ b/.json-c.metadata
@@ -1 +1 @@
-0249e2fbb242ef3ef225b49cb23ef0c314e17bd4 SOURCES/json-c-0.17-20230812.tar.gz
+7c5679b5d797609ed34ec0918bfdb04e78055ade SOURCES/json-c-0.18-20240915.tar.gz
diff --git a/SPECS/json-c.spec b/SPECS/json-c.spec
index 3b5c0d6..ffeb01d 100644
--- a/SPECS/json-c.spec
+++ b/SPECS/json-c.spec
@@ -21,12 +21,12 @@
 %global so_ver 5
 
 # Releases are tagged with a date stamp.
-%global reldate 20230812
+%global reldate 20240915
 
 
 Name:           json-c
-Version:        0.17
-Release:        5%{?dist}
+Version:        0.18
+Release:        3%{?dist}
 Summary:        JSON implementation in C
 
 License:        MIT
@@ -63,6 +63,7 @@ Summary:        Reference manual for json-c
 
 BuildRequires:  doxygen
 BuildRequires:  hardlink
+Requires:       %{name} = %{version}-%{release}
 
 %description    doc
 This package contains the reference manual for %{name}.
@@ -131,13 +132,24 @@ unset USE_VALGRIND
 
 
 %files doc
-%if 0%{?fedora} || 0%{?rhel} >= 7
-%license %{_datadir}/licenses/%{name}*
-%endif
 %doc %{_pkgdocdir}
+%exclude %{_pkgdocdir}/ChangeLog
+%exclude %{_pkgdocdir}/README*
 
 
 %changelog
+* Wed Nov 06 2024 Tomas Korbar <tkorbar@redhat.com> - 0.18-3
+- Improve fix of problem on upgrade of doc subpackage
+- Related: RHEL-65629
+
+* Tue Nov 05 2024 Tomas Korbar <tkorbar@redhat.com> - 0.18-2
+- Fix problem on upgrade of doc subpackage
+- Related: RHEL-65629
+
+* Tue Nov 05 2024 Tomas Korbar <tkorbar@redhat.com> - 0.18-1
+- Rebase to 0.18
+- Resolves: RHEL-65629
+
 * Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.17-5
 - Bump release for October 2024 mass rebuild:
   Resolves: RHEL-64018