From 6cb54ea1428e3b88e658ef3c0dfc7544aa077d7f Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Thu, 24 Mar 2022 07:56:50 +0000 Subject: [PATCH] import flatpak-1.10.7-1.el8 --- .flatpak.metadata | 2 +- .gitignore | 2 +- SPECS/flatpak.spec | 19 ++++++++++--------- 3 files changed, 12 insertions(+), 11 deletions(-) diff --git a/.flatpak.metadata b/.flatpak.metadata index 5b443f6..9912e74 100644 --- a/.flatpak.metadata +++ b/.flatpak.metadata @@ -1 +1 @@ -ea9cd44ca1e6cdab1e450a8abc7c5e760194ac25 SOURCES/flatpak-1.8.7.tar.xz +5f93e0a445a2e0088f114c2e2a192ce7a98faae2 SOURCES/flatpak-1.10.7.tar.xz diff --git a/.gitignore b/.gitignore index 71e6537..597890b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/flatpak-1.8.7.tar.xz +SOURCES/flatpak-1.10.7.tar.xz diff --git a/SPECS/flatpak.spec b/SPECS/flatpak.spec index a9c988c..9e50902 100644 --- a/SPECS/flatpak.spec +++ b/SPECS/flatpak.spec @@ -1,8 +1,8 @@ %global bubblewrap_version 0.4.0 -%global ostree_version 2018.9 +%global ostree_version 2020.8 Name: flatpak -Version: 1.8.7 +Version: 1.10.7 Release: 1%{?dist} Summary: Application deployment framework for desktop apps @@ -10,8 +10,6 @@ License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz -BuildRequires: autoconf -BuildRequires: automake BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(dconf) BuildRequires: pkgconfig(fuse) @@ -33,11 +31,8 @@ BuildRequires: bubblewrap >= %{bubblewrap_version} BuildRequires: docbook-dtds BuildRequires: docbook-style-xsl BuildRequires: gettext -BuildRequires: gettext-devel BuildRequires: gpgme-devel -BuildRequires: gtk-doc BuildRequires: libcap-devel -BuildRequires: libtool BuildRequires: python3-pyparsing BuildRequires: systemd BuildRequires: /usr/bin/python3 @@ -126,8 +121,6 @@ This package contains installed tests for %{name}. %build -autoreconf --force --install --verbose - (if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi; # Generate consistent IDs between runs to avoid multilib problems. export XMLTO_FLAGS="--stringparam generate.consistent.ids=1" @@ -150,6 +143,11 @@ install -d %{buildroot}%{_sysconfdir}/flatpak/remotes.d rm -f %{buildroot}%{_libdir}/libflatpak.la %find_lang %{name} +# Work around selinux denials, see +# https://github.com/flatpak/flatpak/issues/4128 for details. Note that we are +# going to need the system env generator if we should enable malcontent support +# in the future. +rm %{buildroot}%{_systemd_system_env_generator_dir}/60-flatpak-system-only %pre getent group flatpak >/dev/null || groupadd -r flatpak @@ -247,6 +245,9 @@ fi %changelog +* Wed Mar 09 2022 Debarshi Ray - 1.10.7-1 +- Rebase to 1.10.7 (#2062417) + * Thu Feb 03 2022 Debarshi Ray - 1.8.7-1 - Rebase to 1.8.7 (#2041972)