Update to snapshot e00149f

Upstream now sets a SONAME since e00149f, drop the downstream versioning.

Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
This commit is contained in:
Javier Martinez Canillas 2021-09-28 14:18:27 +02:00
parent dd68389e5d
commit 7fa34c6291
No known key found for this signature in database
GPG Key ID: C751E590D63F3D69
3 changed files with 7 additions and 53 deletions

View File

@ -1,8 +1,6 @@
%global commit 39c2d5dc95e46b8c1659b721521e4e438ab7d8a3
%global commit e00149fccb0a16b445359c8037a6f4cfd484a10f
%global shortcommit %(c=%{commit}; echo ${c:0:7})
%global commitdate 20210908
%global soname_major 0
%global soname_minor 1
%global commitdate 20210928
Name: libcamera
Version: 0.0.0~git.%{commitdate}.%{shortcommit}
@ -21,12 +19,6 @@ Source0: %{name}-%{shortcommit}.tar.xz
Source1: qcam.desktop
Source2: qcam.metainfo.xml
# Upstream does not have a versioned SONAME yet so a downstream
# .so name versioning is required as mentioned in Fedora docs:
#
# https://docs.fedoraproject.org/en-US/packaging-guidelines/#_downstream_so_name_versioning
Patch0001: meson-Set-a-downstream-.so-name-version.patch
BuildRequires: doxygen
BuildRequires: gcc-c++
BuildRequires: gtest-devel
@ -143,7 +135,7 @@ rm -rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-*/html/.doctrees
%files
%license COPYING.rst LICENSES/LGPL-2.1-or-later.txt
%{_libdir}/libcamera*.so.%{soname_major}.%{soname_minor}
%{_libdir}/libcamera*.so.*
%files devel
%{_includedir}/%{name}/
@ -173,6 +165,9 @@ rm -rf ${RPM_BUILD_ROOT}/%{_docdir}/%{name}-*/html/.doctrees
%{_bindir}/lc-compliance
%changelog
* Tue Sep 28 2021 Javier Martinez Canillas <javierm@redhat.com> - 0.0.0~git.20210928.e00149f-1
- Update to snapshot e00149f
* Wed Sep 08 2021 Javier Martinez Canillas <javierm@redhat.com> - 0.0.0~git.20210908.39c2d5d-1
- Update to snapshot 39c2d5d
- Add snapshot date information to follow the Fedora packaging guidelines

View File

@ -1,41 +0,0 @@
From 022135aec2de6b2978955a0213e7dad2ce0e5fd0 Mon Sep 17 00:00:00 2001
From: Javier Martinez Canillas <javierm@redhat.com>
Date: Fri, 10 Sep 2021 12:08:21 +0200
Subject: [PATCH] meson: Set a downstream .so name version
The Fedora packaging guidelines says that if upstream doesn't have a
version .so library, a downstream versioning has to be added.
Signed-off-by: Javier Martinez Canillas <javierm@redhat.com>
---
src/libcamera/base/meson.build | 1 +
src/libcamera/meson.build | 1 +
2 files changed, 2 insertions(+)
diff --git a/src/libcamera/base/meson.build b/src/libcamera/base/meson.build
index d799c66d8b3..cae6a6e8709 100644
--- a/src/libcamera/base/meson.build
+++ b/src/libcamera/base/meson.build
@@ -28,6 +28,7 @@ libcamera_base_args = [ '-DLIBCAMERA_BASE_PRIVATE' ]
libcamera_base_lib = shared_library('libcamera-base',
[libcamera_base_sources, libcamera_base_headers],
+ soversion : '0.1',
name_prefix : '',
install : true,
cpp_args : libcamera_base_args,
diff --git a/src/libcamera/meson.build b/src/libcamera/meson.build
index e9230b983ae..69f19e004ab 100644
--- a/src/libcamera/meson.build
+++ b/src/libcamera/meson.build
@@ -127,6 +127,7 @@ libcamera_deps = [
libcamera = shared_library('libcamera',
libcamera_sources,
+ soversion : '0.1',
name_prefix : '',
install : true,
include_directories : includes,
--
2.31.1

View File

@ -1 +1 @@
SHA512 (libcamera-39c2d5d.tar.xz) = 012fceb16e0bb00508c314f52e95689c2bd216f935d6164365956b8d8465bbd2f7db8628b1a563a5f70c4fddf93de7695f63a5e383ba2afb96a8d834a8681ea1
SHA512 (libcamera-e00149f.tar.xz) = 309cf6980c26c8764f2812a4f1fa568dfd1f1d4051a3565ffe31e1d536182d012bbff90c067f3b82f03e87ff06169e860791786dce9890c109533f78785a262e