diff --git a/0001-meson-git-version-is-optional.patch b/0001-meson-git-version-is-optional.patch deleted file mode 100644 index 31bbc44..0000000 --- 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.spec b/gcab.spec index 4f257b7..1030322 100644 --- a/gcab.spec +++ b/gcab.spec @@ -1,13 +1,12 @@ Name: gcab -Version: 1.5 -Release: 2%{?dist} +Version: 1.6 +Release: 1%{?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 @@ -78,6 +77,9 @@ Libraries, includes, etc. to compile with the gcab library. %{_libdir}/pkgconfig/libgcab-1.0.pc %changelog +* Mon Jul 10 2023 Marc-André Lureau - 1.6-1 +- new version + * Thu Jan 19 2023 Fedora Release Engineering - 1.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/sources b/sources index 0314906..1bb6846 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (gcab-1.5.tar.xz) = 2a9b7d2720abbb5527d478ac760898ae254d08b7aa929fbb21753296e5a07c51d62e134a3f8b1b21d9b557d4093505194e09823ddbaf58465d37b372f37534b7 +SHA512 (gcab-1.6.tar.xz) = 26b8dcf47ba98e7cc073a551d1c965c13a72d298c8a4e124823bdbb20fe314c8f687232df9ae824a54d81f96fe7d9ac1a40aed24e51f8706595079cec2c61fc9