From a0a512830ea5240f01ebde24e031591b27ff1079 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Feb 19 2023 12:31:43 +0000
Subject: add upstream patch for libpcap-1.10.2+


---

diff --git a/21.patch b/21.patch
new file mode 100644
index 0000000..eb296dc
--- /dev/null
+++ b/21.patch
@@ -0,0 +1,43 @@
+From 77e2de892cd359f779c84739682431a66eb8cf31 Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Sun, 8 Jan 2023 11:03:52 +0100
+Subject: [PATCH] Makefile: fix pcap-config call
+
+Fix the following build failure raised since libpcap version 1.10.2 and
+https://github.com/the-tcpdump-group/libpcap/commit/d0cba780dc2b2bb4f3ca9427d1a0f03479f45707:
+
+pcap-config: Invalid command-line option pcap-config specified
+Usage: pcap-config [ --help ] [ --static | --static-pcap-only ] [ --libs | --additional-libs ]
+perl -nle 'm/^Version:\s+(.*)$/ and print $1' \
+	bustle.cabal > dist/build/autogen/version.txt
+echo '#define BUSTLE_VERSION "'`cat dist/build/autogen/version.txt`'"' > dist/build/autogen/version.h
+/home/buildroot/autobuild/run/instance-2/output-1/host/bin/arm-linux-gcc -Idist/build/autogen -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  -Os -g0  -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64  \
+	-o dist/build/bustle-pcap c-sources/pcap-reader.c c-sources/pcap-monitor.c c-sources/bustle-pcap.c \
+	-I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/glib-2.0 -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/glib-2.0/include -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/libmount -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/blkid -I/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/include/gio-unix-2.0 -pthread -L/home/buildroot/autobuild/run/instance-2/output-1/host/bin/../arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib -lgio-2.0 -lgobject-2.0 -lglib-2.0
+/home/buildroot/autobuild/run/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/arm-buildroot-linux-uclibcgnueabi/10.3.0/../../../../arm-buildroot-linux-uclibcgnueabi/bin/ld: /tmp/cc5SQkTV.o: in function `bustle_pcap_reader_finalize':
+pcap-reader.c:(.text+0x254): undefined reference to `pcap_close'
+
+Fixes:
+ - http://autobuild.buildroot.org/results/f3dcb617488e4172e639e3bd51a93bc9822ea186
+
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 8865819..721e714 100644
+--- a/Makefile
++++ b/Makefile
+@@ -2,7 +2,7 @@ CFLAGS = -g -O2 -Wall -Wunused -Waddress
+ DBUS_FLAGS = $(shell pkg-config --cflags --libs dbus-1)
+ GIO_FLAGS := $(shell pkg-config --cflags --libs 'glib-2.0 >= 2.26' gio-2.0 gio-unix-2.0)
+ PCAP_CONFIG ?= pcap-config
+-PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags pcap-config --libs)
++PCAP_FLAGS := $(shell $(PCAP_CONFIG) --cflags --libs)
+ DESTDIR =
+ PREFIX = /usr/local
+ BINDIR = $(DESTDIR)$(PREFIX)/bin
+-- 
+GitLab
+
diff --git a/bustle.spec b/bustle.spec
index ea8a3aa..72bf8df 100644
--- a/bustle.spec
+++ b/bustle.spec
@@ -5,7 +5,7 @@
 
 Name:           bustle
 Version:        0.8.0
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Draw sequence diagrams of D-Bus traffic
 
 License:        LGPL-2.1-or-later
@@ -15,6 +15,8 @@ Source0:        https://hackage.haskell.org/package/%{name}-%{version}/%{name}-%
 # End cabal-rpm sources
 # taken from ghc-hgettext
 Patch0:         bustle-hgettext-Cabal24.patch
+# https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21
+Patch1:         https://gitlab.freedesktop.org/bustle/bustle/-/merge_requests/21.patch
 
 Requires:       gnome-icon-theme
 BuildRequires:  desktop-file-utils
@@ -58,6 +60,7 @@ frequencies and average method call times.
 %setup -q
 # End cabal-rpm setup
 %patch0 -p1 -b .orig
+%patch1 -p1 -b .orig
 
 
 %build
@@ -95,6 +98,11 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/org.freedesktop.Bustl
 
 
 %changelog
+* Sun Feb 19 2023 Jens Petersen <petersen@redhat.com> - 0.8.0-6
+- add upstream patch for libpcap-1.10.2+
+- tweak bustle-hgettext-Cabal24.patch for CabalSpecVersion
+- refresh to cabal-rpm-2.1.0 with SPDX migration
+
 * Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.8.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild