From 5b5ad8bb3f2480cd49998fe5c741a08638365ff5 Mon Sep 17 00:00:00 2001
From: Kalev Lember <klember@redhat.com>
Date: Wed, 6 Oct 2021 10:29:42 +0200
Subject: [PATCH] Don't use lockdev for flatpak builds
lockdev style locking doesn't work in flatpaks because (1) /run/lock is
not shared with the host, and (2) systemd-tmpfiles isn't currently
available in our flatpak runtime so /run/lock/lockdev/ directory doesn't
get correctly set up.
While at this, also drop manual requires on lockdev as it's already
pulled in through autogenerated soname dependencies.
---
libgphoto2.spec | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/libgphoto2.spec b/libgphoto2.spec
index a9f2a50..647192e 100644
--- a/libgphoto2.spec
+++ b/libgphoto2.spec
@@ -5,7 +5,7 @@
Name: libgphoto2
Version: 2.5.27
-Release: 2%{?dist}
+Release: 3%{?dist}
Summary: Library for accessing digital cameras
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
License: GPLv2+ and GPLv2
@@ -32,9 +32,10 @@ BuildRequires: pkgconfig(libexif)
# -----------------------------------
# libgphoto2_port
# -----------------------------------
+%if !0%{?flatpak}
BuildRequires: lockdev-devel
+%endif
BuildRequires: pkgconfig(libusb-1.0)
-Requires: lockdev
# -----------------------------------
# Temporarily required for patch3
@@ -156,6 +157,9 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
%{_mandir}/man3/%{name}_port.3*
%changelog
+* Wed Oct 06 2021 Kalev Lember <klember@redhat.com> - 2.5.27-3
+- Don't use lockdev for flatpak builds
+
* Thu Jul 22 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2.5.27-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild