From 200011c5e2520f9a387c7f31dbd4110a6675740e Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Sat, 6 Jan 2024 04:27:29 +0100 Subject: [PATCH] update to 2.5.28 [release 2.5.28-1mamba;Sun Jan 09 2022] --- libgphoto2.spec | 66 +++++++++++++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 19 deletions(-) diff --git a/libgphoto2.spec b/libgphoto2.spec index 23b32b8..361c7eb 100644 --- a/libgphoto2.spec +++ b/libgphoto2.spec @@ -1,5 +1,5 @@ Name: libgphoto2 -Version: 2.5.27 +Version: 2.5.28 Release: 1mamba Epoch: 1 Summary: A portable library to gives access to more than 400 digital cameras @@ -7,7 +7,7 @@ Group: System/Libraries Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco -URL: https://www.gphoto.org +URL: http://www.gphoto.org Source0: http://downloads.sourceforge.net/project/gphoto/libgphoto/%{version}/libgphoto2-%{version}.tar.bz2 Source1: libgphoto-usbcam Patch0: libgphoto-2.4.6-serial.so_undef_symbol_rsm_unlock_device.patch @@ -19,26 +19,49 @@ BuildRequires: libX11-devel BuildRequires: libXau-devel BuildRequires: libXdmcp-devel BuildRequires: libXpm-devel +BuildRequires: libbrotli-devel +BuildRequires: libbsd-devel BuildRequires: libbzip2-devel -BuildRequires: libdw-devel +BuildRequires: libcares-devel +BuildRequires: libcurl-devel +BuildRequires: libe2fs-devel BuildRequires: libexif-devel BuildRequires: libexpat-devel BuildRequires: libfontconfig-devel BuildRequires: libfreetype-devel BuildRequires: libgd-devel +BuildRequires: libglib-devel +BuildRequires: libgraphite2-devel +BuildRequires: libgsasl-devel +BuildRequires: libgss-devel +BuildRequires: libharfbuzz-devel +BuildRequires: libidn-devel +BuildRequires: libidn2-devel BuildRequires: libjbig-devel BuildRequires: libjpeg-devel +BuildRequires: libkrb5-devel +BuildRequires: liblockdev-devel BuildRequires: libltdl-devel BuildRequires: liblzma-devel +BuildRequires: libnghttp2-devel +BuildRequires: libntlm-devel +BuildRequires: libopenldap-devel +BuildRequires: libopenssl-devel +BuildRequires: libpcre-devel BuildRequires: libpng-devel +BuildRequires: libpsl-devel +BuildRequires: librtmp-devel +BuildRequires: libsasl2-devel +BuildRequires: libssh2-devel BuildRequires: libtiff-devel BuildRequires: libudev-devel -BuildRequires: libusb-compat-devel -BuildRequires: libusbx-devel -BuildRequires: libvpx-devel +BuildRequires: libunistring-devel +BuildRequires: libusb-devel +BuildRequires: libwebp-devel BuildRequires: libxcb-devel BuildRequires: libxml2-devel BuildRequires: libz-devel +BuildRequires: libzstd-devel ## AUTOBUILDREQ-END %if "%{stage1}" != "1" BuildRequires: avahi-compat-libdns_sd-devel @@ -47,10 +70,9 @@ BuildRequires: liblockdev >= 1.0.1 BuildRequires: libpopt-devel >= 4.4.5 BuildRequires: libuuid-devel Provides: libgphoto -Obsoletes: libgphoto +Obsoletes: libgphoto < 1:2.5.28 Requires: udev >= 103 Requires: %{name}-common = %{epoch}:%{version}-%{release} -BuildRoot: %{_tmppath}/%{name}-%{version}-root %description Libgphoto2 is the core of gphoto2 software. @@ -61,13 +83,12 @@ Summary: Static libraries and headers for %{name} Group: Development/Libraries Requires: %{name} = %{epoch}:%{version}-%{release} Provides: libgphoto-devel -Obsoletes: libgphoto-devel +Obsoletes: libgphoto-devel < 1:2.5.28 %description devel Libgphoto2 is the core of gphoto2 software. It is a portable library to gives access to more than 400 digital cameras. - -This package contains static libraries and header files need for development. +This package contains static libraries and header files needed for development. %package common Summary: Arch independent files for %{name} @@ -85,6 +106,8 @@ Obsoletes: libgphoto-apidocs %description apidocs Libgphoto2 API documentation. +%debug_package + %prep %setup -q -n libgphoto2-%{version} #%patch0 -p1 @@ -95,31 +118,33 @@ Libgphoto2 API documentation. --with-gnu-ld \ --with-ltdl \ --with-drivers=all \ - --with-camlibdir=%{_libdir}/libgphoto2 \ --without-resmgr \ --without-hal \ --enable-static +# --with-camlibdir=%{_libdir}/libgphoto2 \ + # --with-cdk \ # --without-baudboy \ # --without-ttylock \ # --without-lockdev # --enable-docs -%make udevscriptdir=/lib/udev/ +%make + +#udevscriptdir=/lib/udev/ %install [ "%{buildroot}" != / ] && rm -rf %{buildroot} -%makeinstall udevscriptdir=/lib/udev/ +%makeinstall udevscriptdir=%{_prefix}/lib/udev/ -install -d %{buildroot}/lib/udev/rules.d/ -install -d %{buildroot}%{_datadir}/hal/fdi/information/10freedesktop +install -d %{buildroot}%{_udevrulesdir} install -D -m 0755 %{SOURCE1} %{buildroot}%{_sysconfdir}/udev/scripts/usbcam cd packaging/generic ./print-camera-list udev-rules version 136 \ mode 660 owner root group camera > \ - %{buildroot}/lib/udev/rules.d/40-libgphoto2.rules + %{buildroot}%{_udevrulesdir}/40-libgphoto2.rules cd ../.. @@ -147,10 +172,10 @@ cat *.lang > %{name}.lang %files common %defattr(-,root,root) %{_sysconfdir}/udev/scripts/usbcam -/lib/udev/rules.d/40-libgphoto2.rules %dir %{_datadir}/libgphoto2/%{version} %{_datadir}/libgphoto2/%{version}/* -/lib/udev/check-ptp-camera +%{_udevrulesdir}/40-libgphoto2.rules +%{_prefix}/lib/udev/check-ptp-camera %files devel %defattr(-,root,root) @@ -178,6 +203,9 @@ cat *.lang > %{name}.lang %{_datadir}/doc/libgphoto2_port/* %changelog +* Sun Jan 09 2022 Silvan Calarco 2.5.28-1mamba +- update to 2.5.28 + * Sun Feb 21 2021 Automatic Build System 2.5.27-1mamba - automatic version update by autodist