diff --git a/0001-meson-git-version-is-optional.patch b/0001-meson-git-version-is-optional.patch new file mode 100644 index 0000000000000000000000000000000000000000..31bbc443756c2454660ff700a59cbd269dc501f0 --- /dev/null +++ b/0001-meson-git-version-is-optional.patch @@ -0,0 +1,32 @@ +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.4.tar.xz b/gcab-1.4.tar.xz deleted file mode 100644 index 35ebbb48821c989b621c98eadce01873360a7e1c..0000000000000000000000000000000000000000 Binary files a/gcab-1.4.tar.xz and /dev/null differ diff --git a/gcab-1.5.tar.xz b/gcab-1.5.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..bea74aced99a0121e51b80fe69cbd457ee1cf3cd Binary files /dev/null and b/gcab-1.5.tar.xz differ diff --git a/gcab.spec b/gcab.spec index c92733bc33f23c9fc0e140c55b32d59c39d23abb..c3308226b9001215005b559d98e32e2638308bbd 100644 --- a/gcab.spec +++ b/gcab.spec @@ -1,11 +1,15 @@ +%define anolis_release 1 + Name: gcab -Version: 1.4 -Release: 1%{?dist} +Version: 1.5 +Release: %{anolis_release}%{?dist} Summary: Cabinet file library and tool License: LGPLv2+ 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 @@ -17,11 +21,19 @@ BuildRequires: zlib-devel BuildRequires: meson BuildRequires: git -Requires: libgcab1%{?_isa} = %{version}-%{release} +Requires: libgcab1 = %{version}-%{release} %description gcab is a tool to manipulate Cabinet archive. +%package doc +Summary: Documentation files for %{name} +Requires: %{name} = %{version}-%{release} +BuildArch: noarch + +%description doc +The %{name}-doc package contains documentation files for %{name}. + %package -n libgcab1 Summary: Library to create Cabinet archives @@ -30,7 +42,7 @@ libgcab is a library to manipulate Cabinet archive using GIO/GObject. %package -n libgcab1-devel Summary: Development files to create Cabinet archives -Requires: libgcab1%{?_isa} = %{version}-%{release} +Requires: libgcab1 = %{version}-%{release} Requires: glib2-devel Requires: pkgconfig @@ -57,10 +69,13 @@ Libraries, includes, etc. to compile with the gcab library. %ldconfig_scriptlets -n libgcab1 %files -%doc COPYING NEWS +%doc COPYING %{_bindir}/gcab %{_mandir}/man1/gcab.1* +%files doc +%doc NEWS + %files -n libgcab1 -f %{name}.lang %doc COPYING NEWS %{_libdir}/girepository-1.0/GCab-1.0.typelib @@ -76,5 +91,8 @@ Libraries, includes, etc. to compile with the gcab library. %{_libdir}/pkgconfig/libgcab-1.0.pc %changelog +* Wed Sep 21 2022 mgb01105731 - 1.5-1 +- update to 1.5 + * Fri Mar 18 2022 forrest_ly - 1.4-1 - Init for Anolis OS 23