!13 Update to 1.5

From: @dwl301 
Reviewed-by: @zhang__3125 
Signed-off-by: @zhang__3125
This commit is contained in:
openeuler-ci-bot 2023-01-31 09:24:32 +00:00 committed by Gitee
commit 41a03fda0c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 41 additions and 4 deletions

View File

@ -0,0 +1,32 @@
From 15464009a220b67543787a9dbbbdbef4704be3fc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Fri, 5 Aug 2022 11:13:41 +0400
Subject: [PATCH] meson: git version is optional
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Fix commit a755e2ae77035aad9644adadaec5ecf15e9656ba ("meson: fix new
warning about run_command()")
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 15fd5cd..5eba715 100644
--- a/meson.build
+++ b/meson.build
@@ -8,7 +8,7 @@ project('gcab', 'c',
git_version = []
git = find_program('git', required: false)
if git.found()
- git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: true).stdout().strip().split('-')
+ git_version = run_command(git, 'describe', '--abbrev=4', '--dirty', check: false).stdout().strip().split('-')
endif
# libtool versioning
--
2.37.1

Binary file not shown.

BIN
gcab-1.5.tar.xz Normal file

Binary file not shown.

View File

@ -1,10 +1,11 @@
Name: gcab
Version: 1.4
Release: 2
Version: 1.5
Release: 1
Summary: A GObject library to create cabinet files
License: LGPLv2+
URL: http://ftp.gnome.org/pub/GNOME/sources/gcab
Source0: http://ftp.gnome.org/pub/GNOME/sources/%{name}/%{version}/%{name}-%{version}.tar.xz
Patch0000: 0001-meson-git-version-is-optional.patch
BuildRequires: meson zlib-devel gobject-introspection-devel glib2-devel
BuildRequires: gettext gtk-doc vala
@ -12,6 +13,7 @@ BuildRequires: git
Obsoletes: libgcab1 < %{version}-%{release}
Provides: libgcab1 = %{version}-%{release}
Provides: libgcab1%{?_isa} = %{version}-%{release}
%description
Gcab is a gobject library to create cabinet files.
@ -49,7 +51,7 @@ This package contains the development files for %{name}.
%files -f %{name}.lang
%license COPYING
%{_bindir}/%{name}
%{_libdir}/*/GCab-1.0.typelib
%{_libdir}/girepository-1.0/GCab-1.0.typelib
%{_libdir}/lib%{name}*.so.*
%files devel
@ -58,13 +60,16 @@ This package contains the development files for %{name}.
%{_libdir}/pkgconfig/*.pc
%{_datadir}/gir-1.0/GCab-1.0.gir
%{_datadir}/gtk-doc/html/%{name}/*
%{_datadir}/vala/*/lib%{name}-1.0*
%{_datadir}/vala/vapi
%files help
%doc NEWS README.md
%{_mandir}/man1/gcab.1*
%changelog
* Mon Jan 02 2023 lin zhang <lin.zhang@turbolinux.com.cn> - 1.5-1
- update to 1.5
* Wed Jun 30 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.4-2
- Recover provides virtual subpackage libgcab1, libgcab1-devel