From 7c547a1e8373ace22e53ed41fdcb1ebab4e46025 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Fri, 31 May 2024 16:36:12 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .flatpak.metadata | 1 - .gitignore | 2 +- SPECS/flatpak.spec | 18 ++++++++++++++---- 3 files changed, 15 insertions(+), 6 deletions(-) delete mode 100644 .flatpak.metadata diff --git a/.flatpak.metadata b/.flatpak.metadata deleted file mode 100644 index 9912e74..0000000 --- a/.flatpak.metadata +++ /dev/null @@ -1 +0,0 @@ -5f93e0a445a2e0088f114c2e2a192ce7a98faae2 SOURCES/flatpak-1.10.7.tar.xz diff --git a/.gitignore b/.gitignore index 597890b..f7ca2f2 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/flatpak-1.10.7.tar.xz +SOURCES/flatpak-1.10.8.tar.xz diff --git a/SPECS/flatpak.spec b/SPECS/flatpak.spec index 9e50902..c75ea9c 100644 --- a/SPECS/flatpak.spec +++ b/SPECS/flatpak.spec @@ -2,8 +2,8 @@ %global ostree_version 2020.8 Name: flatpak -Version: 1.10.7 -Release: 1%{?dist} +Version: 1.10.8 +Release: 2%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ @@ -16,6 +16,7 @@ BuildRequires: pkgconfig(fuse) BuildRequires: pkgconfig(gdk-pixbuf-2.0) BuildRequires: pkgconfig(gio-unix-2.0) BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0 +BuildRequires: pkgconfig(gpgme) BuildRequires: pkgconfig(json-glib-1.0) BuildRequires: pkgconfig(libarchive) >= 2.8.0 BuildRequires: pkgconfig(libseccomp) @@ -31,11 +32,11 @@ BuildRequires: bubblewrap >= %{bubblewrap_version} BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: gettext -BuildRequires: gpgme-devel +BuildRequires: libassuan-devel BuildRequires: libcap-devel +BuildRequires: python3-devel BuildRequires: python3-pyparsing BuildRequires: systemd -BuildRequires: /usr/bin/python3 BuildRequires: /usr/bin/xmlto BuildRequires: /usr/bin/xsltproc @@ -118,6 +119,8 @@ This package contains installed tests for %{name}. %prep %autosetup -p1 +# Make sure to use the RHEL-lifetime supported Python and no other +%py3_shebang_fix scripts/* variant-schema-compiler/* %build @@ -245,6 +248,13 @@ fi %changelog +* Mon Sep 04 2023 Miro HronĨok - 1.10.8-2 +- Make sure to use the RHEL-lifetime supported Python and no other (RHEL-2225) + +* Tue Jul 11 2023 Debarshi Ray - 1.10.8-1 +- Rebase to 1.10.8 (#2222103) +- Fix CVE-2023-28100 and CVE-2023-28101 (#2180311) + * Wed Mar 09 2022 Debarshi Ray - 1.10.7-1 - Rebase to 1.10.7 (#2062417)