Add a patch to backport fixes applied on upstream master branch

This commit is contained in:
Björn Esser 2020-05-10 20:03:40 +02:00
parent 5c85c7c85a
commit 49e8670da5
2 changed files with 880 additions and 1 deletions

File diff suppressed because one or more lines are too long

View File

@ -26,7 +26,7 @@
Name: json-c Name: json-c
Version: 0.14 Version: 0.14
Release: 1%{?dist} Release: 2%{?dist}
Summary: JSON implementation in C Summary: JSON implementation in C
License: MIT License: MIT
@ -35,6 +35,7 @@ Source0: %{url}/archive/%{name}-%{version}-%{reldate}.tar.gz
# Cherry-picked from upstream. # Cherry-picked from upstream.
Patch0001: %{url}/commit/228881c8fc287182f284a58d8279a32fbeae0b7f.patch#/%{name}-0.14-dont_install_config_h.patch Patch0001: %{url}/commit/228881c8fc287182f284a58d8279a32fbeae0b7f.patch#/%{name}-0.14-dont_install_config_h.patch
Patch0002: %{url}/pull/603.patch#/%{name}-0.14-backport_fixes_from_master.patch
BuildRequires: cmake BuildRequires: cmake
BuildRequires: gcc BuildRequires: gcc
@ -77,6 +78,7 @@ This package contains the reference manual for %{name}.
%build %build
mkdir -p %{_vpath_builddir} mkdir -p %{_vpath_builddir}
%cmake \ %cmake \
-DBUILD_STATIC_LIBS:BOOL=OFF \
-DCMAKE_BUILD_TYPE:STRING=RELEASE \ -DCMAKE_BUILD_TYPE:STRING=RELEASE \
-DCMAKE_C_FLAGS_RELEASE:STRING="" \ -DCMAKE_C_FLAGS_RELEASE:STRING="" \
-DDISABLE_BSYMBOLIC:BOOL=OFF \ -DDISABLE_BSYMBOLIC:BOOL=OFF \
@ -130,6 +132,9 @@ popd
%changelog %changelog
* Sun May 10 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-2
- Add a patch to backport fixes applied on upstream master branch
* Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-1 * Tue Apr 21 2020 Björn Esser <besser82@fedoraproject.org> - 0.14-1
- Update to 0.14 - Update to 0.14