From 800b316a17b6ca93dc61c65a95412105f28722ea Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Thu, 5 Aug 2021 12:31:26 -0500 Subject: [PATCH] Fix 1908783 --- config.h.patch | 13 +++++++++++++ libprelude.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 config.h.patch diff --git a/config.h.patch b/config.h.patch new file mode 100644 index 0000000..4762da7 --- /dev/null +++ b/config.h.patch @@ -0,0 +1,13 @@ +--- prelude-inttypes.h~ 2021-08-05 09:52:17.002556351 -0500 ++++ prelude-inttypes.h 2021-08-05 12:09:26.446094909 -0500 +@@ -48,10 +48,6 @@ + #define __PRELUDE_UINT64_SUFFIX(x) x ##ULL + #endif + +-#ifdef HAVE_CONFIG_H +-# include "config.h" +-#endif +- + #ifdef __PRELUDE_HAVE_STDINT_H + # include + #endif diff --git a/libprelude.spec b/libprelude.spec index f2c9290..4ef49cf 100644 --- a/libprelude.spec +++ b/libprelude.spec @@ -7,11 +7,13 @@ Name: libprelude Version: 5.2.0 -Release: 7%{?dist} +Release: 8%{?dist} Summary: Secure Connections between all Sensors and the Prelude Manager License: LGPL-2.1+ URL: https://www.prelude-siem.org/ Source0: https://www.prelude-siem.org/pkg/src/5.2.0/%{name}-%{version}.tar.gz +# See BZ 1908783 +Source1: config.h.patch # https://www.prelude-siem.org/issues/860 Patch0: libprelude-5.2.0-ruby_vendorarchdir.patch # https://www.prelude-siem.org/issues/862 @@ -172,6 +174,8 @@ find %{buildroot} -name '*.la' -delete find %{buildroot} -name 'perllocal.pod' -delete find %{buildroot} -name '.packlist' -delete +patch -d %{buildroot}%{_includedir}/libprelude/ -p0 < %SOURCE1 + # Enable test again after fixing #1629893 #%check #make check @@ -235,6 +239,9 @@ find %{buildroot} -name '.packlist' -delete %doc AUTHORS ChangeLog README NEWS %changelog +* Thu Aug 05 2021 Gwyn Ciesla - 5.2.0-8 +- Fix BZ 1908783 + * Thu Jul 22 2021 Fedora Release Engineering - 5.2.0-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild