From b5ff59a2e1dd088a3de2388d57370a1767e6b4df Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Wed, 13 Dec 2023 15:15:33 -0500
Subject: [PATCH] Fix build with libxml2-2.12.0

https://pagure.io/oddjob/pull-request/24
---
 oddjob-libxml2.patch | 28 ++++++++++++++++++++++++++++
 oddjob.spec          |  9 ++++++++-
 2 files changed, 36 insertions(+), 1 deletion(-)
 create mode 100644 oddjob-libxml2.patch

diff --git a/oddjob-libxml2.patch b/oddjob-libxml2.patch
new file mode 100644
index 0000000..adb90eb
--- /dev/null
+++ b/oddjob-libxml2.patch
@@ -0,0 +1,28 @@
+From 3d30f6fec556f2eb53671832ae47687ace1fc655 Mon Sep 17 00:00:00 2001
+From: Yaakov Selkowitz <yselkowi@redhat.com>
+Date: Wed, 13 Dec 2023 15:12:32 -0500
+Subject: [PATCH] Fix build with libxml2-2.12.0
+
+https://gitlab.gnome.org/GNOME/libxml2/-/releases/v2.12.0
+
+"Several cyclic dependencies in public header files were fixed. As a
+result, certain headers won't include other headers as before."
+---
+ src/oddjobd.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/oddjobd.c b/src/oddjobd.c
+index 44de748..fb63c02 100644
+--- a/src/oddjobd.c
++++ b/src/oddjobd.c
+@@ -47,6 +47,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <dbus/dbus.h>
++#include <libxml/globals.h>
+ #include <libxml/xmlreader.h>
+ #ifdef SELINUX_ACLS
+ #include <selinux/selinux.h>
+-- 
+2.43.0
+
diff --git a/oddjob.spec b/oddjob.spec
index 70a4235..2728322 100644
--- a/oddjob.spec
+++ b/oddjob.spec
@@ -22,10 +22,13 @@
 
 Name: oddjob
 Version: 0.34.7
-Release: 9%{?dist}
+Release: 10%{?dist}
 Source0: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz
 Source1: https://releases.pagure.org/oddjob/oddjob-%{version}.tar.gz.asc
 Patch1: oddjob-override-mask-fix.patch
+# Fix build with libxml2-2.12.0
+# https://pagure.io/oddjob/pull-request/24
+Patch2: oddjob-libxml2.patch
 Summary: A D-Bus service which runs odd jobs on behalf of client applications
 License: BSD
 BuildRequires: make
@@ -90,6 +93,7 @@ This package contains a trivial sample oddjob service.
 %prep
 %setup -q
 %patch1 -p1
+%patch -P2 -p1
 
 %build
 sample_flag=
@@ -249,6 +253,9 @@ fi
 exit 0
 
 %changelog
+* Wed Dec 13 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 0.34.7-10
+- Fix build with libxml2-2.12.0
+
 * Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.34.7-9
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild