Accepting request 1156276 from GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/1156276 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flatpak?expand=0&rev=82
This commit is contained in:
commit
287ca478c3
@ -1,3 +1,9 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 7 11:21:12 UTC 2024 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
- Add a flatpak-selinux subpackage that provides a SELinux policy
|
||||||
|
module (boo#1220591).
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Nov 14 19:34:15 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
Tue Nov 14 19:34:15 UTC 2023 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
|
46
flatpak.spec
46
flatpak.spec
@ -1,7 +1,7 @@
|
|||||||
#
|
#
|
||||||
# spec file for package flatpak
|
# spec file for package flatpak
|
||||||
#
|
#
|
||||||
# Copyright (c) 2023 SUSE LLC
|
# Copyright (c) 2024 SUSE LLC
|
||||||
#
|
#
|
||||||
# All modifications and additions to the file contributed by third parties
|
# All modifications and additions to the file contributed by third parties
|
||||||
# remain the property of their copyright owners, unless otherwise agreed
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
@ -16,6 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%global selinuxtype targeted
|
||||||
%define libname libflatpak0
|
%define libname libflatpak0
|
||||||
%define bubblewrap_version 0.8.0
|
%define bubblewrap_version 0.8.0
|
||||||
%define ostree_version 2020.8
|
%define ostree_version 2020.8
|
||||||
@ -60,6 +61,7 @@ BuildRequires: libgpgme-devel >= 1.1.8
|
|||||||
BuildRequires: libtool
|
BuildRequires: libtool
|
||||||
BuildRequires: pkgconfig
|
BuildRequires: pkgconfig
|
||||||
BuildRequires: python3-pyparsing
|
BuildRequires: python3-pyparsing
|
||||||
|
BuildRequires: selinux-policy-devel
|
||||||
BuildRequires: systemd-rpm-macros
|
BuildRequires: systemd-rpm-macros
|
||||||
BuildRequires: sysuser-tools
|
BuildRequires: sysuser-tools
|
||||||
BuildRequires: xdg-dbus-proxy >= %{xdg_dbus_proxy_version}
|
BuildRequires: xdg-dbus-proxy >= %{xdg_dbus_proxy_version}
|
||||||
@ -94,6 +96,7 @@ Requires: bubblewrap >= %{bubblewrap_version}
|
|||||||
Requires: ostree >= %{ostree_version}
|
Requires: ostree >= %{ostree_version}
|
||||||
Requires: xdg-dbus-proxy >= %{xdg_dbus_proxy_version}
|
Requires: xdg-dbus-proxy >= %{xdg_dbus_proxy_version}
|
||||||
Requires: xdg-desktop-portal >= 0.10
|
Requires: xdg-desktop-portal >= 0.10
|
||||||
|
Requires: (flatpak-selinux = %{version} if selinux-policy-%{selinuxtype})
|
||||||
Requires: user(flatpak)
|
Requires: user(flatpak)
|
||||||
# Remove after openSUSE Leap 42 is out of scope
|
# Remove after openSUSE Leap 42 is out of scope
|
||||||
Provides: xdg-app = %{version}
|
Provides: xdg-app = %{version}
|
||||||
@ -160,8 +163,8 @@ more information.
|
|||||||
Summary: Add Flathub repository to system flatpak
|
Summary: Add Flathub repository to system flatpak
|
||||||
Group: System/Packages
|
Group: System/Packages
|
||||||
Requires: flatpak
|
Requires: flatpak
|
||||||
Requires(postun):flatpak
|
Requires(postun): flatpak
|
||||||
Requires(postun):sed
|
Requires(postun): sed
|
||||||
Supplements: flatpak
|
Supplements: flatpak
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
@ -169,6 +172,20 @@ BuildArch: noarch
|
|||||||
Flathub is a widely used repository for Flatpak applications. This package
|
Flathub is a widely used repository for Flatpak applications. This package
|
||||||
adds the Flathub repository to the list of system flatpak remotes.
|
adds the Flathub repository to the list of system flatpak remotes.
|
||||||
|
|
||||||
|
%package selinux
|
||||||
|
Summary: SELinux policy module for flatpak
|
||||||
|
Group: System Environment/Base
|
||||||
|
Requires: flatpak
|
||||||
|
BuildArch: noarch
|
||||||
|
%{?selinux_requires}
|
||||||
|
|
||||||
|
%description selinux
|
||||||
|
flatpak is a system for building, distributing and running sandboxed desktop
|
||||||
|
applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for
|
||||||
|
more information.
|
||||||
|
|
||||||
|
This package provides the SELinux policy module for flatpak.
|
||||||
|
|
||||||
%postun remote-flathub
|
%postun remote-flathub
|
||||||
# upon uninstall
|
# upon uninstall
|
||||||
if [ $1 == 0 ]; then
|
if [ $1 == 0 ]; then
|
||||||
@ -199,6 +216,7 @@ sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-*
|
|||||||
--enable-documentation \
|
--enable-documentation \
|
||||||
--enable-gtk-doc \
|
--enable-gtk-doc \
|
||||||
--with-wayland-security-context=yes \
|
--with-wayland-security-context=yes \
|
||||||
|
--with-selinux_module=yes \
|
||||||
%{nil}
|
%{nil}
|
||||||
%make_build
|
%make_build
|
||||||
%sysusers_generate_pre system-helper/flatpak.conf system-user-flatpak flatpak.conf
|
%sysusers_generate_pre system-helper/flatpak.conf system-user-flatpak flatpak.conf
|
||||||
@ -263,6 +281,24 @@ fi
|
|||||||
%service_del_postun update-system-flatpaks.service
|
%service_del_postun update-system-flatpaks.service
|
||||||
%service_del_postun update-system-flatpaks.timer
|
%service_del_postun update-system-flatpaks.timer
|
||||||
|
|
||||||
|
%pre selinux
|
||||||
|
%selinux_relabel_pre -s %{selinuxtype}
|
||||||
|
|
||||||
|
%post selinux
|
||||||
|
%selinux_modules_install -s %{selinuxtype} %{_datadir}/selinux/packages/flatpak.pp.bz2
|
||||||
|
|
||||||
|
%preun selinux
|
||||||
|
%selinux_relabel_pre -s %{selinuxtype}
|
||||||
|
|
||||||
|
%postun selinux
|
||||||
|
if [ $1 -eq 0 ]; then
|
||||||
|
%selinux_modules_uninstall -s %{selinuxtype} flatpak
|
||||||
|
%selinux_relabel_post -s %{selinuxtype}
|
||||||
|
fi;
|
||||||
|
|
||||||
|
%posttrans selinux
|
||||||
|
%selinux_relabel_post -s %{selinuxtype}
|
||||||
|
|
||||||
%files -f %{name}.lang
|
%files -f %{name}.lang
|
||||||
%license COPYING
|
%license COPYING
|
||||||
%{_bindir}/flatpak
|
%{_bindir}/flatpak
|
||||||
@ -356,4 +392,8 @@ fi
|
|||||||
%files remote-flathub
|
%files remote-flathub
|
||||||
%config %{_sysconfdir}/flatpak/remotes.d/flathub.flatpakrepo
|
%config %{_sysconfdir}/flatpak/remotes.d/flathub.flatpakrepo
|
||||||
|
|
||||||
|
%files selinux
|
||||||
|
%{_datadir}/selinux/devel/include/contrib/flatpak.if
|
||||||
|
%{_datadir}/selinux/packages/flatpak.pp.bz2
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
Loading…
Reference in New Issue
Block a user