update to 2.5.31

gphoto2-device-return.patch

@@ -1,4 +1,4 @@
-From 242878ac1cefd1ef99c2e5d84a794f72e49e28be Mon Sep 17 00:00:00 2001
+From 189602f17a2b3363d5b358ce726924a866a4979a Mon Sep 17 00:00:00 2001
 From: Lubomir Rintel <lkundrak@v3.sk>
 Date: Fri, 23 Oct 2009 13:12:16 +0200
 Subject: [PATCH] Repair reattach of kernel driver if it was unbound
@@ -7,26 +7,45 @@ Drah in the header for USBDEVFS_CONNECT.
 
 Signed-off-by: Lubomir Rintel <lkundrak@v3.sk>
 ---
- libgphoto2_port/usb/libusb.c |    6 ++++++
+ libgphoto2_port/usb/libusb.c | 24 +++++++++++++++++++++++-
- 1 files changed, 6 insertions(+), 0 deletions(-)
+ 1 file changed, 23 insertions(+), 1 deletion(-)
 
 diff --git a/libgphoto2_port/usb/libusb.c b/libgphoto2_port/usb/libusb.c
-index d1535a5..c8a63f1 100644
+index 3cd91fa..dfd347c 100644
 --- a/libgphoto2_port/usb/libusb.c
 +++ b/libgphoto2_port/usb/libusb.c
-@@ -38,6 +38,12 @@
+@@ -44,8 +44,30 @@
  #include <gphoto2/gphoto2-port-result.h>
  #include <gphoto2/gphoto2-port-log.h>
  
+-#include "libgphoto2_port/i18n.h"
 +#if defined(LIBUSB_HAS_GET_DRIVER_NP) && defined(LIBUSB_HAS_DETACH_KERNEL_DRIVER_NP)
 +/* Pull in USBDEVFS_CONNECT */
 +#include <sys/ioctl.h>
 +#include <linux/usbdevice_fs.h>
 +#endif
-+
+ 
- #ifdef ENABLE_NLS
++#ifdef ENABLE_NLS
- #  include <libintl.h>
++#  include <libintl.h>
- #  undef _
++#  undef _
++#  define _(String) dgettext (GETTEXT_PACKAGE, String)
++#  ifdef gettext_noop
++#    define N_(String) gettext_noop (String)
++#  else
++#    define N_(String) (String)
++#  endif
++#else
++#  define textdomain(String) (String)
++#  define gettext(String) (String)
++#  define dgettext(Domain,Message) (Message)
++#  define dcgettext(Domain,Message,Type) (Message)
++#  define bindtextdomain(Domain,Directory) (Domain)
++#  define _(String) (String)
++#  define N_(String) (String)
++#endif
+ 
+ #define CHECK(result) {int r=(result); if (r<0) return (r);}
+ 
 -- 
-1.6.5.rc2
+2.34.1
 

libgphoto2.spec

@@ -1,7 +1,7 @@
 Name:           libgphoto2
 Summary:        library for giving access to literally hundreds of digital cameras
-Version:        2.5.18
+Version:        2.5.31
-Release:        4
+Release:        1
 License:        GPL-2.0+ and LGPL-2.1+
 URL:            http://www.gphoto.org/
 Source0:        http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
@@ -9,7 +9,7 @@ Source0:        http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.b
 Patch1:         gphoto2-pkgcfg.patch
 Patch2:         gphoto2-device-return.patch
 
-BuildRequires:  gcc gcc-c++ make systemd libtool-ltdl-devel libjpeg-devel gd-devel
+BuildRequires:  gcc gcc-c++ make systemd libtool-ltdl-devel libjpeg-devel gd-devel libcurl-devel
 BuildRequires:  pkgconfig(libxml-2.0) pkgconfig(libexif) lockdev-devel pkgconfig(libusb-1.0)
 
 Requires:       lockdev
@@ -53,12 +53,14 @@ make %{?_smp_mflags}
 %install
 %make_install INSTALL="install -p" mandir=%{_mandir}
 
-pushd packaging/linux-hotplug/
+pushd packaging/generic/
   export LIBDIR=${RPM_BUILD_ROOT}%{_libdir}
   export CAMLIBS=${RPM_BUILD_ROOT}%{_libdir}/%{name}/%{version}
   export LD_LIBRARY_PATH=${RPM_BUILD_ROOT}%{_libdir}
   install -d ${RPM_BUILD_ROOT}%{_udevrulesdir}
-  ${RPM_BUILD_ROOT}%{_libdir}/%{name}/print-camera-list udev-rules version 136 > ${RPM_BUILD_ROOT}%{_udevrulesdir}/40-%{name}.rules
+  %{buildroot}%{_libdir}/%{name}/print-camera-list udev-rules version 201 > %{buildroot}%{_udevrulesdir}/40-%{name}.rules 
+  install -d %{buildroot}%{_udevhwdbdir}            
+  %{buildroot}%{_libdir}/%{name}/print-camera-list hwdb version 201 > %{buildroot}%{_udevhwdbdir}/20-gphoto2.hwdb
 popd
 
 find ${RPM_BUILD_ROOT} -type f -name "*.la" -print -delete
@@ -68,6 +70,7 @@ find ${RPM_BUILD_ROOT} -type f -name "*.la" -print -delete
 cat %{name}*.lang >> %{name}.lang
 
 mkdir __doc
+rm -rf %{buildroot}%{_pkgdocdir}_port/{AUTHORS,NEWS,README}
 cp -a ${RPM_BUILD_ROOT}%{_pkgdocdir}/* __doc
 
 %files -f %{name}.lang
@@ -75,12 +78,13 @@ cp -a ${RPM_BUILD_ROOT}%{_pkgdocdir}/* __doc
 %dir %{_libdir}/%{name}/
 %dir %{_libdir}/%{name}/%{version}/
 %dir %{_libdir}/%{name}_port/
-%dir %{_libdir}/%{name}_port/0.12.0/
+%dir %{_libdir}/%{name}_port/0.12.2/
 %{_libdir}/%{name}.so.*
 %{_libdir}/%{name}_port.so.*
 %{_libdir}/%{name}/%{version}/*.so
-%{_libdir}/%{name}_port/0.12.0/*.so
+%{_libdir}/%{name}_port/0.12.2/*.so
 %{_udevrulesdir}/40-%{name}.rules
+%{_udevhwdbdir}/20-gphoto2.hwdb
 %(pkg-config --variable=udevdir udev)/check-ptp-camera
 %{_datadir}/%{name}/
 %exclude %{_includedir}/gphoto2/gphoto2
@@ -107,6 +111,9 @@ cp -a ${RPM_BUILD_ROOT}%{_pkgdocdir}/* __doc
 %postun -p /sbin/ldconfig
 
 %changelog
+* Thu Sep 28 2023 liyanan <thistleslyn@163.com> - 2.5.31-1
+- Update to 2.5.31
+
 * Thu Jan 21 2021 Ge Wang<wangge20@huawei.com> - 2.5.18-4
 - Modify license information