diff --git a/0001-print-camera-list-Fix-udev-rules-for-linux-4.14.patch b/0001-print-camera-list-Fix-udev-rules-for-linux-4.14.patch deleted file mode 100644 index f6c17a7..0000000 --- a/0001-print-camera-list-Fix-udev-rules-for-linux-4.14.patch +++ /dev/null @@ -1,61 +0,0 @@ -From 24d7645039a953ff0a113ff2f913b894e4e254d7 Mon Sep 17 00:00:00 2001 -From: Bastien Nocera -Date: Tue, 11 Dec 2018 11:33:48 +0100 -Subject: [PATCH] print-camera-list: Fix udev rules for linux-4.14+ - -Since commit 1455cf8dbfd0 ("driver core: emit uevents when -device is bound to a driver") the kernel started emitting -"bind" and "unbind" uevents which confuse the libgphoto2 -udev rules. - -This caused ID_GPHOTO2 and GPHOTO2_DRIVER udev properties not being set -on devices, causing them not to be visible to user-space that uses those -properties (such as gvfs' gphoto2 backend). - -See https://github.com/systemd/systemd/issues/8221 ---- - packaging/generic/print-camera-list.c | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/packaging/generic/print-camera-list.c b/packaging/generic/print-camera-list.c -index fe982c44e..9057278b8 100644 ---- a/packaging/generic/print-camera-list.c -+++ b/packaging/generic/print-camera-list.c -@@ -399,13 +399,13 @@ udev_parse_params (const func_params_t *params, void **data) - */ - static const char * const begin_strings[] = { - /* UDEV_PRE_0_98 */ -- "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n" -+ "ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n" - "BUS!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n", - /* UDEV_0_98 */ -- "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n" -+ "ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n" - "SUBSYSTEM!=\"usb|usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n", - /* UDEV_136 */ -- "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n" -+ "ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n" - "SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n" - "ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n" - "ENV{ID_USB_INTERFACES}==\"\", IMPORT{program}=\"usb_id --export %%p\"\n" -@@ -415,7 +415,7 @@ udev_parse_params (const func_params_t *params, void **data) - * more rules . It will be completed in udev_begin_func() */ - "ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", ", - /* UDEV_175 */ -- "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n" -+ "ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n" - "SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n" - "ENV{DEVTYPE}!=\"usb_device\", GOTO=\"libgphoto2_usb_end\"\n\n" - "ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n" -@@ -426,7 +426,7 @@ udev_parse_params (const func_params_t *params, void **data) - "ENV{ID_USB_INTERFACES}==\"*:060101:*\", ENV{ID_GPHOTO2}=\"1\", ENV{GPHOTO2_DRIVER}=\"PTP\", ", - - /* UDEV_201 ... regular stuff is done via hwdb, only scsi generic here. */ -- "ACTION!=\"add\", GOTO=\"libgphoto2_rules_end\"\n" -+ "ACTION!=\"add|bind\", GOTO=\"libgphoto2_rules_end\"\n" - "SUBSYSTEM!=\"usb\", GOTO=\"libgphoto2_usb_end\"\n" - "ENV{ID_USB_INTERFACES}==\"\", IMPORT{builtin}=\"usb_id\"\n" - /* shortcut the most common camera driver, ptp class, so we avoid parsing 1000 --- -2.19.2 - diff --git a/libgphoto2.spec b/libgphoto2.spec index 442876b..de26a33 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -4,8 +4,8 @@ %global port_version 0.12.0 Name: libgphoto2 -Version: 2.5.21 -Release: 4%{?dist} +Version: 2.5.23 +Release: 1%{?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 @@ -15,7 +15,6 @@ Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.b Patch1: gphoto2-pkgcfg.patch Patch2: gphoto2-device-return.patch # https://github.com/gphoto/libgphoto2/pull/332 -Patch3: 0001-print-camera-list-Fix-udev-rules-for-linux-4.14.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -146,6 +145,9 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/ %{_mandir}/man3/%{name}_port.3* %changelog +* Wed Aug 21 2019 Josef Řídký - 2.5.23-1 +- New upstream release 2.5.23 + * Thu Jul 25 2019 Fedora Release Engineering - 2.5.21-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild diff --git a/sources b/sources index 1b2ff1e..149ab4d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgphoto2-2.5.21.tar.bz2) = 08e5d6a7b7603b92d3e24d3ee7843aa980525f25b7315e7ca6f17a6a1e059748471d9cf0b19392ea965cf0eb094386be275fcb5b97de1d9e7df6c66fe92a81c6 +SHA512 (libgphoto2-2.5.23.tar.bz2) = f5f8f33e934989e6f832952c6c7c2c9e37c436652a08191e8ccced293447a090cb596fff80b9b0ad52c99c0ffc08a1207ca7ef2b630dc52f4c6d7f86e4cbc95a