From 676949a3690d0db769bd57a8f6ab89f712901f33 Mon Sep 17 00:00:00 2001
From: Peter Czanik <peter@czanik.hu>
Date: Jul 24 2023 14:52:29 +0000
Subject: update to 4.3.0


pcre -> pcre2
add bpf and opentelemetry support
make bpf and opentelemetry conditional, exclude on i686

---

diff --git a/syslog-ng.spec b/syslog-ng.spec
index e2e8018..c11e8e1 100644
--- a/syslog-ng.spec
+++ b/syslog-ng.spec
@@ -8,7 +8,7 @@
 
 Name:    syslog-ng
 Version: %{syslog_ng_ver}
-Release: 2%{?dist}
+Release: 3%{?dist}
 Summary: Next-generation syslog server
 
 License: GPLv2+
@@ -70,12 +70,24 @@ BuildRequires:  python3-six
 BuildRequires:  python3-urllib3
 BuildRequires:  python3-websocket-client
 
+%ifarch i686
+%bcond_with bpf
+%bcond_with otel
+%else
+%bcond_without bpf
+%bcond_without otel
+%endif
+
+%if %{with bpf}
 BuildRequires: libbpf-devel
 BuildRequires: bpftool
 BuildRequires: clang
+%endif
 
+%if %{with otel}
 BuildRequires:  grpc-devel
 BuildRequires:  protobuf-devel
+%endif
 
 Requires: logrotate
 Requires: ivykis >= %{ivykis_ver}
@@ -323,8 +335,12 @@ touch -r lib/cfg-grammar.y lib/merge-grammar.py
     --disable-java \
     --disable-java-modules \
     --enable-afsnmp \
+%if %{with otel}
     --enable-cpp --enable-grpc \
+%endif
+%if %{with bpf}
     --enable-ebpf \
+%endif
     --enable-riemann
 
 make %{_smp_mflags}
@@ -541,14 +557,15 @@ fi
 %files amqp
 %{_libdir}/syslog-ng/libafamqp.so
 
-
+%if %{with bpf}
 %files bpf
 %{_libdir}/%{name}/libebpf.so
+%endif
 
-
+%if %{with otel}
 %files opentelemetry
 %{_libdir}/%{name}/libotel.so
-
+%endif
 
 %files python
 %{_libdir}/%{name}/libmod-python.so
@@ -577,10 +594,11 @@ fi
 
 
 %changelog
-* Mon Jul 24 2023 Peter Czanik <peter@czanik.hu> - 4.3.0-1
+* Mon Jul 24 2023 Peter Czanik <peter@czanik.hu> - 4.3.0-3
 - update to 4.3.0
 - pcre -> pcre2
 - add bpf and opentelemetry support
+- make bpf and opentelemetry conditional, exclude on i686
 
 * Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.2.0-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild