From 8419b1bfaf99d21b142730dfc7ae1967ec9ebb70 Mon Sep 17 00:00:00 2001 From: DistroBaker Date: Wed, 27 Jan 2021 10:09:05 +0000 Subject: [PATCH] Merged update from upstream sources This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/libgphoto2.git#0a3a8134ddfefdecec8c7bc2cb9a6676e609a3b1 --- libgphoto2.spec | 17 ++++++++++++++--- sources | 2 +- 2 files changed, 15 insertions(+), 4 deletions(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index eb3d0ac..ff1a618 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -4,7 +4,7 @@ %global port_version 0.12.0 Name: libgphoto2 -Version: 2.5.25 +Version: 2.5.26 Release: 1%{?dist} Summary: Library for accessing digital cameras # GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2 @@ -14,7 +14,6 @@ URL: http://www.gphoto.org/ Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2 Patch1: gphoto2-pkgcfg.patch Patch2: gphoto2-device-return.patch -Patch3: 0001-configure-fix-symver-support-checks.patch BuildRequires: gcc BuildRequires: gcc-c++ @@ -101,7 +100,11 @@ pushd packaging/linux-hotplug/ # Output udev rules for device identification; this is used by GVfs gphoto2 # backend and others. mkdir -p %{buildroot}%{_udevrulesdir} - %{buildroot}%{_libdir}/%{name}/print-camera-list udev-rules version 136 > %{buildroot}%{_udevrulesdir}/40-libgphoto2.rules + %{buildroot}%{_libdir}/%{name}/print-camera-list udev-rules version 201 > %{buildroot}%{_udevrulesdir}/40-libgphoto2.rules + + # Add support for hwdb (#1658259) + mkdir -p %{buildroot}%{_udevhwdbdir} + %{buildroot}%{_libdir}/%{name}/print-camera-list hwdb version 201 > %{buildroot}%{_udevhwdbdir}/20-gphoto2.hwdb popd # remove circular symlink in /usr/include/gphoto2 (#460807) @@ -136,6 +139,7 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/ %{_libdir}/%{name}/%{version}/*.so %{_libdir}/%{name}_port/%{port_version}/*.so %{_udevrulesdir}/40-libgphoto2.rules +%{_udevhwdbdir}/20-gphoto2.hwdb %{udevdir}/check-ptp-camera %{_datadir}/libgphoto2/ @@ -152,6 +156,13 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/ %{_mandir}/man3/%{name}_port.3* %changelog +* Wed Jan 27 2021 Josef Ridky - 2.5.26-1 +- New upstream release 2.5.26 (#1887201) +- Add support for hwdb output (#1658259) + +* Tue Jan 26 2021 Fedora Release Engineering - 2.5.25-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Oct 07 2020 Josef Ridky - 2.5.25-1 - New upstream release 2.5.25 (#1839543) diff --git a/sources b/sources index 1438a7f..fc4e714 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (libgphoto2-2.5.25.tar.bz2) = ee3b9c36d41eb1271faad7a172b0c58134debf8c1104396868fa2c1032d69b4e8821117825f952049a6c36078461aabb7f87712c8563573fa69d1e9383b87845 +SHA512 (libgphoto2-2.5.26.tar.bz2) = d05a559447ac867f4826d2e20b83831dc4b4776c1e3edc9de0867050a4d39dc45b25a33ec73806282e16f75adb1dded3b59fe428bdb1dde4365c12d7af244cec