0001-gcab-Fix-regression-from-commit-a15d91073fd5d6be25.patch

@@ -0,0 +1,51 @@
+From 3365b4bd58dd7f13e786caf3c7234cf8116263d9 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
+Date: Wed, 25 Jul 2018 12:45:24 +0200
+Subject: [PATCH] gcab: Fix regression from commit a15d91073fd5d6be25
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Apparently, rewinding should reset the CDATA state.
+
+See also:
+https://bugzilla.redhat.com/show_bug.cgi?id=1608301
+
+Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
+---
+ libgcab/gcab-folder.c | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libgcab/gcab-folder.c b/libgcab/gcab-folder.c
+index 1b09fa3..c0d6600 100644
+--- a/libgcab/gcab-folder.c
++++ b/libgcab/gcab-folder.c
+@@ -423,6 +423,7 @@ gcab_folder_extract (GCabFolder *self,
+     g_autoptr(GSList) files = NULL;
+     g_autoptr(cdata_t) cdata = g_new0 (cdata_t, 1);
+     guint32 nubytes = 0;
++    guint8 *reserved;
+ 
+     /* never loaded from a stream */
+     g_assert (self->cfolder != NULL);
+@@ -433,7 +434,7 @@ gcab_folder_extract (GCabFolder *self,
+     files = g_slist_sort (g_slist_copy (self->files), (GCompareFunc)sort_by_offset);
+ 
+     /* this is allocated for every block, but currently unused */
+-    cdata->reserved = g_malloc (res_data);
++    cdata->reserved = reserved = g_malloc (res_data);
+ 
+     for (f = files; f != NULL; f = f->next) {
+         GCabFile *file = f->data;
+@@ -454,6 +455,8 @@ gcab_folder_extract (GCabFolder *self,
+             if (!g_seekable_seek (G_SEEKABLE (data), self->cfolder->offsetdata,
+                                   G_SEEK_SET, cancellable, error))
+                 return FALSE;
++            bzero(cdata, sizeof(cdata_t));
++            cdata->reserved = reserved;
+             nubytes = 0;
+         }
+ 
+-- 
+2.18.0.321.gffc6fa0e39
+

0001-meson-git-version-is-optional.patch

@@ -1,32 +0,0 @@
-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
-

gcab.spec

@@ -1,19 +1,18 @@
 Name:           gcab
-Version:        1.5
+Version:        1.1
-Release:        1
+Release:        4
 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
+
+Patch1:         0001-gcab-Fix-regression-from-commit-a15d91073fd5d6be25.patch
 
 BuildRequires:  meson zlib-devel gobject-introspection-devel glib2-devel
 BuildRequires:  gettext gtk-doc vala
-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.
@@ -32,7 +31,7 @@ This package contains the development files for %{name}.
 %package_help
 
 %prep
-%autosetup -n %{name}-%{version}
+%autosetup -n %{name}-%{version} -p1
 
 %build
 %meson
@@ -51,7 +50,7 @@ This package contains the development files for %{name}.
 %files -f %{name}.lang
 %license COPYING
 %{_bindir}/%{name}
-%{_libdir}/girepository-1.0/GCab-1.0.typelib
+%{_libdir}/*/GCab-1.0.typelib
 %{_libdir}/lib%{name}*.so.*
 
 %files devel
@@ -60,26 +59,12 @@ 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/vapi
+%{_datadir}/vala/*/lib%{name}-1.0*
 
 %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
-
-* Mon May 24 2021 weijin deng <weijin.deng@turbolinux.com.cn> - 1.4-1
-- Upgrade to 1.4
-- Update Version, Release, Obsoletes, Provides, stage %prep
-- Delete patches
-
-* Tue May 18 2021 lin.zhang <lin.zhang@turbolinux.com.cn>  - 1.1-5
-- add BuildRequires git
-
 * Mon Nov 25 2019 openEuler Buildteam <buildteam@openeuler.org> - 1.1-4
 - Package init

gcab.yaml

@@ -1,4 +1,4 @@
 version_control: gitlab.gnome
 src_repo: gcab
-tag_prefix: ^v
+tag_prefix: "^v"
-seperator: .
+seperator: "."