From 4be501c0223fd6e7f60c7102618a919f42220790 Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Fri, 25 Mar 2022 11:34:15 +0800 Subject: [PATCH 1/2] move json-c (cherry picked from commit ca53afa2fd1f3897cd22a650e4c0f60af640440c) --- json-c.spec | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/json-c.spec b/json-c.spec index 57f2150..b21145e 100644 --- a/json-c.spec +++ b/json-c.spec @@ -6,14 +6,14 @@ Name: json-c Version: 0.15 -Release: 1 +Release: 2 Summary: JSON implementation in C License: MIT URL: https://github.com/%{name}/%{name} Source0: %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz -BuildRequires: cmake gcc ninja-build json-c +BuildRequires: cmake gcc ninja-build %description JSON-C implements a reference counting object model that allows you @@ -73,8 +73,6 @@ doxygen -s -u doc/Doxyfile.in #%cmake_install DESTDIR="%{buildroot}" %__cmake --install "%{_vpath_builddir}" -cp -a %{_libdir}/libjson-c.so.4 $RPM_BUILD_ROOT%{_libdir} -cp -a %{_libdir}/libjson-c.so.4.0.0 $RPM_BUILD_ROOT%{_libdir} mkdir -p %{buildroot}%{_pkgdocdir} hardlink -cfv %{buildroot}%{_pkgdocdir} @@ -96,6 +94,9 @@ hardlink -cfv %{buildroot}%{_pkgdocdir} %doc %{_pkgdocdir} %changelog +* Fri Mar 25 2022 wuchaochao - 0.15-2 +- move json-c + * Tue Sep 14 2021 hanhui - 0.15-1 - update to 0.15 -- Gitee From c96d375c0db7d1baa09814be4a1513996c31908b Mon Sep 17 00:00:00 2001 From: 19909236985 Date: Fri, 25 Mar 2022 11:40:30 +0800 Subject: [PATCH 2/2] move json-c (cherry picked from commit 28d50bacc5d97d128cf25dcd1ac804fd21af3239) --- json-c.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/json-c.spec b/json-c.spec index b21145e..3999152 100644 --- a/json-c.spec +++ b/json-c.spec @@ -82,7 +82,6 @@ hardlink -cfv %{buildroot}%{_pkgdocdir} %files %license AUTHORS COPYING %{_libdir}/lib%{name}.so.%{so_ver}* -%{_libdir}/libjson-c.so.4* %files devel %{_includedir}/%{name}/ -- Gitee