From 026f8e33b2f4502832cb14f36d5512fd731ccb87 Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Mon, 8 Apr 2024 01:02:28 +0300 Subject: [PATCH] import cjson-1.7.17-1.el9 --- .cjson.metadata | 2 +- .gitignore | 2 +- SOURCES/README.md | 3 +++ SPECS/cjson.spec | 39 ++++++++++++++++++++++++++++++++------- 4 files changed, 37 insertions(+), 9 deletions(-) create mode 100644 SOURCES/README.md diff --git a/.cjson.metadata b/.cjson.metadata index c8feaae..ced5200 100644 --- a/.cjson.metadata +++ b/.cjson.metadata @@ -1 +1 @@ -b401e57edbc9377f0b4139206297984e073c4e47 SOURCES/cjson-1.7.14.tar.gz +486d8f7beedb238473a2e6940d53f9867e551fa4 SOURCES/cjson-1.7.17.tar.gz diff --git a/.gitignore b/.gitignore index a4f0a17..cc3a606 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/cjson-1.7.14.tar.gz +SOURCES/cjson-1.7.17.tar.gz diff --git a/SOURCES/README.md b/SOURCES/README.md new file mode 100644 index 0000000..0f08271 --- /dev/null +++ b/SOURCES/README.md @@ -0,0 +1,3 @@ +# cjson + +The cjson package diff --git a/SPECS/cjson.spec b/SPECS/cjson.spec index 5db6e52..9291315 100644 --- a/SPECS/cjson.spec +++ b/SPECS/cjson.spec @@ -1,9 +1,10 @@ Name: cjson -Version: 1.7.14 -Release: 5%{?dist} +Version: 1.7.17 +Release: 1%{?dist} Summary: Ultralightweight JSON parser in ANSI C - -License: MIT and ASL 2.0 + +# several files in tests/ are Apache-2.0 but are not packaged +License: MIT URL: https://github.com/DaveGamble/cJSON Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz @@ -18,6 +19,7 @@ done with. It's a single file of C, and a single header file. Summary: Development files for cJSON Requires: %{name}%{?_isa} = %{version}-%{release} Requires: pkgconfig +Requires: cmake-filesystem %description devel The %{name}-devel package contains libraries and header files for @@ -27,13 +29,12 @@ developing applications that use cJSON. %autosetup -n cJSON-%{version} %build -%cmake +%cmake -DENABLE_CJSON_TEST=ON -DENABLE_TARGET_EXPORT=ON %cmake_build %install %cmake_install rm -f %{buildroot}%{_libdir}/*.{la,a} -rm -f %{buildroot}%{_libdir}/cmake/cJSON/*.cmake %check %ctest @@ -50,12 +51,36 @@ rm -f %{buildroot}%{_libdir}/cmake/cJSON/*.cmake %doc CHANGELOG.md CONTRIBUTORS.md %{_libdir}/libcjson.so %{_libdir}/pkgconfig/libcjson.pc +%{_libdir}/cmake/cJSON/ %{_includedir}/cjson/ %changelog -* Sun Jul 02 2023 Arkady L. Shane - 1.7.14-5 +* Sun Apr 07 2024 Fabian Affolter - 1.7.17.-1 +- Update to latest upstream version 1.7.17 (closes rhbz#2255953) +- Fix rhbz#2254647 + +* Tue Jan 23 2024 Fedora Release Engineering - 1.7.15-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.7.15-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.7.15-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sun Jul 02 2023 Arkady L. Shane - 1.7.15-1 - Rebuilt for MSVSphere 9.2 +* Wed Mar 01 2023 Petr Menšík - 1.7.15-1 +- Update to 1.7.15 +- Export also CMake module + +* Wed Jan 18 2023 Fedora Release Engineering - 1.7.14-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Wed Jul 20 2022 Fedora Release Engineering - 1.7.14-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Wed Jan 19 2022 Fedora Release Engineering - 1.7.14-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild