[Pkg-freeipa-devel] Bug#1052994: oddjob FTBFS when systemd.pc changes systemdsystemunitdir

[Helmut Grohne]

Source: oddjob
Version: 0.34.7-1
Tags: ftbfs patch
User: helmutg at debian.org
Usertags: dep17m2

We want to change the value of systemdsystemunitdir in systemd.pc to
point below /usr. oddjob's upstream build system consumes this variable
while the packaging hard codes its current value. When we change it,
oddjob will FTBFS. Consider applying the attached patch to avoid this
failure.

Helmut
-------------- next part --------------
diff -Nru oddjob-0.34.7/debian/changelog oddjob-0.34.7/debian/changelog
--- oddjob-0.34.7/debian/changelog	2022-03-20 14:52:31.000000000 +0100
+++ oddjob-0.34.7/debian/changelog	2023-09-26 19:40:47.000000000 +0200
@@ -1,3 +1,10 @@
+oddjob (0.34.7-1.1) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS when systemd.pc changes systemdsystemunitdir. (Closes: #-1)
+
+ -- Helmut Grohne <helmut at subdivi.de>  Tue, 26 Sep 2023 19:40:47 +0200
+
 oddjob (0.34.7-1) unstable; urgency=medium
 
   * New upstream version.
diff -Nru oddjob-0.34.7/debian/control oddjob-0.34.7/debian/control
--- oddjob-0.34.7/debian/control	2022-03-20 14:44:53.000000000 +0100
+++ oddjob-0.34.7/debian/control	2023-09-26 19:40:47.000000000 +0200
@@ -14,6 +14,7 @@
  libxml2-dev,
  pkg-config,
  systemd,
+ systemd-dev,
  xmlto,
 Standards-Version: 4.6.0
 Homepage: https://pagure.io/oddjob/
diff -Nru oddjob-0.34.7/debian/oddjob.install oddjob-0.34.7/debian/oddjob.install
--- oddjob-0.34.7/debian/oddjob.install	2021-01-07 07:56:06.000000000 +0100
+++ oddjob-0.34.7/debian/oddjob.install	2023-09-26 19:40:47.000000000 +0200
@@ -1,7 +1,7 @@
 etc/dbus-1/system.d/oddjob.conf
 etc/oddjobd.conf
 etc/oddjobd.conf.d/oddjobd-introspection.conf
-lib/systemd/system/oddjobd.service
+${env:deb_systemdsystemunitdir}/oddjobd.service
 usr/bin/oddjob_request
 usr/libexec/oddjob/sanity.sh
 usr/sbin/oddjobd
diff -Nru oddjob-0.34.7/debian/rules oddjob-0.34.7/debian/rules
--- oddjob-0.34.7/debian/rules	2022-03-20 14:45:05.000000000 +0100
+++ oddjob-0.34.7/debian/rules	2023-09-26 19:40:47.000000000 +0200
@@ -3,6 +3,7 @@
 # see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
+export deb_systemdsystemunitdir = $(shell pkg-config --variable=systemdsystemunitdir systemd | sed s,^/,,)
 
 %:
 	dh $@
@@ -25,7 +26,7 @@
 	# purge .la files
 	find $(CURDIR)/debian/tmp -name "*.la" -type f -exec rm -f "{}" \;
 	# move pam module to correct location
-	mkdir $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}
+	mkdir -p $(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}
 	mv $(CURDIR)/debian/tmp/usr/lib/${DEB_HOST_MULTIARCH}/security \
 		$(CURDIR)/debian/tmp/lib/${DEB_HOST_MULTIARCH}/