Skip to content

Commit 5f0ac64

Browse files
Upgrade libgphoto2 to latest upstream (#10775)
1 parent 32047b8 commit 5f0ac64

4 files changed

Lines changed: 13 additions & 42 deletions

File tree

SPECS-EXTENDED/libgphoto2/gphoto2-device-return.patch

Lines changed: 0 additions & 32 deletions
This file was deleted.
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
22
"Signatures": {
3-
"libgphoto2-2.5.27.tar.bz2": "f8b85478c44948a0b0b52c4d4dfda2de1d7bcb7b262c76bd1ae306d9c63240d7"
3+
"libgphoto2-2.5.31.tar.bz2": "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b"
44
}
5-
}
5+
}

SPECS-EXTENDED/libgphoto2/libgphoto2.spec

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,18 @@ Distribution: Azure Linux
33
%bcond_with gp2ddb
44

55
%global udevdir %(pkg-config --variable=udevdir udev)
6-
%global port_version 0.12.0
6+
%global port_version 0.12.2
77

88
Name: libgphoto2
9-
Version: 2.5.27
10-
Release: 2%{?dist}
9+
Version: 2.5.31
10+
Release: 1%{?dist}
1111
Summary: Library for accessing digital cameras
1212
# GPLV2+ for the main lib (due to exif.c) and most plugins, some plugins GPLv2
1313
License: GPLv2+ and GPLv2
1414
URL: http://www.gphoto.org/
1515

1616
Source0: http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
1717
Patch1: gphoto2-pkgcfg.patch
18-
Patch2: gphoto2-device-return.patch
1918

2019
BuildRequires: gcc
2120
BuildRequires: gcc-c++
@@ -94,7 +93,7 @@ sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool libgphot
9493
%install
9594
%make_install INSTALL="install -p" mandir=%{_mandir}
9695

97-
pushd packaging/linux-hotplug/
96+
pushd packaging/generic/
9897
export LIBDIR=%{buildroot}%{_libdir}
9998
export CAMLIBS=%{buildroot}%{_libdir}/%{name}/%{version}
10099
export LD_LIBRARY_PATH=%{buildroot}%{_libdir}
@@ -146,7 +145,7 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
146145
%{_datadir}/libgphoto2/
147146

148147
%files devel
149-
%doc __doc/*
148+
%doc %{_defaultdocdir}/%{name}_port/*
150149
%{_bindir}/gphoto2-config
151150
%{_bindir}/gphoto2-port-config
152151
%{_includedir}/gphoto2/
@@ -158,6 +157,10 @@ rm -rf %{buildroot}%{_datadir}/libgphoto2_port/*/vcamera/
158157
%{_mandir}/man3/%{name}_port.3*
159158

160159
%changelog
160+
* Wed Oct 16 2024 Kevin Lockwood <v-klockwood@microsoft.com> - 2.5.31-1
161+
- Update to current upstream
162+
- License Verified
163+
161164
* Fri Mar 26 2021 Henry Li <lihl@microsoft.com> - 2.5.27-2
162165
- Initial CBL-Mariner import from Fedora 34 (license: MIT).
163166
- systemd-devel contains the .pc file to provide pkgconfig variables

cgmanifest.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9601,8 +9601,8 @@
96019601
"type": "other",
96029602
"other": {
96039603
"name": "libgphoto2",
9604-
"version": "2.5.27",
9605-
"downloadUrl": "http://downloads.sourceforge.net/gphoto/libgphoto2-2.5.27.tar.bz2"
9604+
"version": "2.5.31",
9605+
"downloadUrl": "http://downloads.sourceforge.net/gphoto/libgphoto2-2.5.31.tar.bz2"
96069606
}
96079607
}
96089608
},

0 commit comments

Comments
 (0)