diff --git a/.gitignore b/.gitignore index cad89e8..b56c5b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/jansson-2.14.tar.bz2 +jansson-2.14.tar.bz2 diff --git a/.jansson.metadata b/.jansson.metadata deleted file mode 100644 index 81e487d..0000000 --- a/.jansson.metadata +++ /dev/null @@ -1 +0,0 @@ -a85a87d4cd9a14a081e8e49cb6a2b54bde4fd6b9 SOURCES/jansson-2.14.tar.bz2 diff --git a/SOURCES/Fix-the-check-exports-tests-for-versioned-symbols.patch b/Fix-the-check-exports-tests-for-versioned-symbols.patch similarity index 100% rename from SOURCES/Fix-the-check-exports-tests-for-versioned-symbols.patch rename to Fix-the-check-exports-tests-for-versioned-symbols.patch diff --git a/SPECS/jansson.spec b/jansson.spec similarity index 59% rename from SPECS/jansson.spec rename to jansson.spec index b3456ae..720d316 100644 --- a/SPECS/jansson.spec +++ b/jansson.spec @@ -1,24 +1,24 @@ Name: jansson Version: 2.14 -Release: 1%{?dist} +Release: 3%{?dist} Summary: C library for encoding, decoding and manipulating JSON data -Group: System Environment/Libraries -License: MIT +# src/lookup3.h is LicenseRef-Fedora-Public-Domain +License: MIT AND LicenseRef-Fedora-Public-Domain URL: http://www.digip.org/jansson/ Source0: https://github.com/akheron/jansson/releases/download/v%{version}/jansson-%{version}.tar.bz2 -Patch1: Fix-the-check-exports-tests-for-versioned-symbols.patch + +Patch0: Fix-the-check-exports-tests-for-versioned-symbols.patch BuildRequires: gcc -BuildRequires: autoconf automake libtool BuildRequires: python3-sphinx +BuildRequires: make %description Small library for parsing and writing JSON documents. %package devel Summary: Header files for jansson -Group: Development/Libraries Requires: %{name}%{?_isa} = %{version}-%{release} %description devel @@ -33,7 +33,6 @@ Development documentation for jansson. %prep %autosetup -p1 -autoreconf --force --install -I m4 %if 0%{?rhel} == 6 %{__sed} -i 's/code-block:: shell/code-block:: none/g' doc/*.rst @@ -41,20 +40,21 @@ autoreconf --force --install -I m4 %build %configure --disable-static -make %{?_smp_mflags} +%make_build make html %check make check %install -make install INSTALL="install -p" DESTDIR="$RPM_BUILD_ROOT" +%make_install rm "$RPM_BUILD_ROOT%{_libdir}"/*.la %ldconfig_scriptlets %files -%doc LICENSE CHANGES +%license LICENSE +%doc CHANGES %{_libdir}/*.so.* %files devel @@ -66,17 +66,70 @@ rm "$RPM_BUILD_ROOT%{_libdir}"/*.la %doc doc/_build/html/* %changelog -* Sun Nov 28 2021 Xin Long - 2.14-1 +* Tue Oct 29 2024 Troy Dawson - 2.14-3 +- Bump release for October 2024 mass rebuild: + Resolves: RHEL-64018 + +* Mon Jun 24 2024 Troy Dawson - 2.14-2 +- Bump release for June 2024 mass rebuild + +* Fri May 03 2024 Xin Long - 2.14-1 - Rebase to 2.14 - Related: rhbz#2001062 + Related: RHEL-30626 -* Fri Aug 03 2018 Xin Long - 2.11-3 -- Deal with warnings under gcc 8 -- Call va_end after va_copy in json_vsprintf -- Fix bogus date in jansson.spec +* Wed Jan 24 2024 Fedora Release Engineering - 2.13.1-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild -* Mon Jul 09 2018 Charalampos Stratakis - 2.11-2 -- Change to python3-sphinx +* Sat Jan 20 2024 Fedora Release Engineering - 2.13.1-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Thu Jul 20 2023 Fedora Release Engineering - 2.13.1-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Thu Jan 19 2023 Fedora Release Engineering - 2.13.1-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Thu Jul 21 2022 Fedora Release Engineering - 2.13.1-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Thu Jan 20 2022 Fedora Release Engineering - 2.13.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Thu Jul 22 2021 Fedora Release Engineering - 2.13.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 2.13.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Mon Aug 24 2020 Charalampos Stratakis - 2.13.1-1 +- Update to 2.13.1 (#1831402) +- Fix docs build failures with Sphinx 3 (#1823532) +- Use make macros: https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + +* Sat Aug 01 2020 Fedora Release Engineering - 2.12-7 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Tue Jul 28 2020 Fedora Release Engineering - 2.12-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Wed Jan 29 2020 Fedora Release Engineering - 2.12-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Aug 3 2019 Peter Robinson 2.12-4 +- Fix build deps, use %%license + +* Thu Jul 25 2019 Fedora Release Engineering - 2.12-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Fri Feb 01 2019 Fedora Release Engineering - 2.12-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Mon Nov 26 2018 Corey Farrell - 2.12-1 +- Update to Jansson 2.12 + +* Fri Jul 13 2018 Fedora Release Engineering - 2.11-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild * Sat Mar 10 2018 Corey Farrell - 2.11-1 - Update to Jansson 2.11 @@ -158,28 +211,28 @@ rm "$RPM_BUILD_ROOT%{_libdir}"/*.la * Fri Jan 13 2012 Fedora Release Engineering - 2.1-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild -* Sat Jun 11 2011 Sean Middleditch 2.1-1 +* Thu Jun 11 2011 Sean Middleditch 2.1-1 - Update to Jansson 2.1. - Drop Sphinx patch, no longer necessary. * Wed Feb 09 2011 Fedora Release Engineering - 1.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild -* Sat Jul 03 2010 Sean Middleditch 1.3-1 +* Thu Jul 03 2010 Sean Middleditch 1.3-1 - Update to Jansson 1.3. - Disable warnings-as-errors for Sphinx documentation. * Thu Jan 21 2010 Sean Middleditch 1.2-1 - Update to Jansson 1.2. -* Mon Jan 11 2010 Sean Middleditch 1.1.3-4 +* Thu Jan 11 2010 Sean Middleditch 1.1.3-4 - Update jansson description per upstream's suggestions. - Removed README from docs. -* Sat Jan 09 2010 Sean Middleditch 1.1.3-3 +* Thu Jan 09 2010 Sean Middleditch 1.1.3-3 - Correct misspelling of jansson in the pkg-config file. -* Sat Jan 09 2010 Sean Middleditch 1.1.3-2 +* Thu Jan 09 2010 Sean Middleditch 1.1.3-2 - Fix Changelog dates. - Mix autoheader warning. - Added make check. diff --git a/sources b/sources new file mode 100644 index 0000000..4f0b080 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (jansson-2.14.tar.bz2) = 1a659c0f41b0672757c13ebd16bd10ad7d6484366aefda078aa816266ce4f5638bc121f1ce8c4234b0b9f201ea73c227b9084125857452cbcba058a111e4a6fd