diff --git a/0001-meson-git-version-is-optional.patch b/0001-meson-git-version-is-optional.patch deleted file mode 100644 index 31bbc443756c2454660ff700a59cbd269dc501f0..0000000000000000000000000000000000000000 --- a/0001-meson-git-version-is-optional.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 15464009a220b67543787a9dbbbdbef4704be3fc Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -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 ---- - 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 - diff --git a/gcab-1.5.tar.xz b/gcab-1.5.tar.xz deleted file mode 100644 index bea74aced99a0121e51b80fe69cbd457ee1cf3cd..0000000000000000000000000000000000000000 Binary files a/gcab-1.5.tar.xz and /dev/null differ diff --git a/gcab-1.6.tar.xz b/gcab-1.6.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..86ef6bf8b167303a54c2b13d5348114f38671ac0 Binary files /dev/null and b/gcab-1.6.tar.xz differ diff --git a/gcab.spec b/gcab.spec index 9c31cd59c7bc088efb56f29aa136f88bae92f6ee..8f8bb490b34f81f23be504debbba40f4471c7f4e 100644 --- a/gcab.spec +++ b/gcab.spec @@ -1,15 +1,14 @@ -%define anolis_release 2 +%define anolis_release 1 Name: gcab -Version: 1.5 +Version: 1.6 Release: %{anolis_release}%{?dist} Summary: Cabinet file library and tool License: LGPLv2+ +#VCS: git:git://git.gnome.org/gcab URL: http://ftp.gnome.org/pub/GNOME/sources/gcab Source0: http://ftp.gnome.org/pub/GNOME/sources/gcab/%{version}/%{name}-%{version}.tar.xz -Patch0000: 0001-meson-git-version-is-optional.patch - BuildRequires: git-core BuildRequires: gettext @@ -71,7 +70,6 @@ Libraries, includes, etc. to compile with the gcab library. %generate_compatibility_deps %files -%license COPYING %{_bindir}/gcab %{_mandir}/man1/gcab.1* %{abidir}/gcab-option.list @@ -96,6 +94,9 @@ Libraries, includes, etc. to compile with the gcab library. %doc NEWS README.md RELEASE %changelog +* Tue Feb 18 2025 wangzhe - 1.6-1 +- Refer to CentOS Stream gcab-1.6-7 (tdawson@redhat.com) + * Wed Mar 1 2023 Jing Zhang - 1.5-2 - Optimize spec