- Added p11-kit-server to fix boo#1221557
After OBS Studio flatpak updating to KDE Runtime 6.6 it was revealed that it no longer could verify SSL certificates. The root cause turned out to be a missing p11-kit-server which on most distributions is installed as recommended along side flatpak (see Fedora). With this little addition I hope to fix random SSL errors for KDE Runtime 6.6 and newer also for openSUSE Tumbleweed. As a side note Leap is affected as well by this. Might be worth back porting this patch? - As per documentation from flatpak 1.0: add weak dep on p11-kit-server for certificate transfer (boo#1188902) OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=202
This commit is contained in:
Git OBS Bridge
commit
22771ae9f1
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
||||
## Default LFS
|
||||
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||
*.png filter=lfs diff=lfs merge=lfs -text
|
||||
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
@ -0,0 +1 @@
|
||||
.osc
|
||||
8
flathub.flatpakrepo
Normal file
8
flathub.flatpakrepo
Normal file
@ -0,0 +1,8 @@
|
||||
[Flatpak Repo]
|
||||
Title=Flathub
|
||||
Url=https://dl.flathub.org/repo/
|
||||
Homepage=https://flathub.org/
|
||||
Comment=Central repository of Flatpak applications
|
||||
Description=Central repository of Flatpak applications
|
||||
Icon=https://dl.flathub.org/repo/logo.svg
|
||||
GPGKey=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
|
||||
3
flatpak-1.15.8.tar.xz
Normal file
3
flatpak-1.15.8.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:e89bcf42fd1eb0fadf14c8b5845bc31cb78a2624f3bdc9bcdd007cc75022e4d3
|
||||
size 1300484
|
||||
3909
flatpak.changes
Normal file
3909
flatpak.changes
Normal file
File diff suppressed because it is too large
Load Diff
408
flatpak.spec
Normal file
408
flatpak.spec
Normal file
@ -0,0 +1,408 @@
|
||||
#
|
||||
# spec file for package flatpak
|
||||
#
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
# upon. The license for this file, and modifications and additions to the
|
||||
# file, is the same license as for the pristine package itself (unless the
|
||||
# license for the pristine package is not an Open Source License, in which
|
||||
# case the license is the MIT License). An "Open Source License" is a
|
||||
# license that conforms to the Open Source Definition (Version 1.9)
|
||||
# published by the Open Source Initiative.
|
||||
|
||||
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||
#
|
||||
|
||||
|
||||
%global selinuxtype targeted
|
||||
%define libname libflatpak0
|
||||
%define bubblewrap_version 0.8.0
|
||||
%define ostree_version 2020.8
|
||||
%define xdg_dbus_proxy_version 0.1.0
|
||||
|
||||
# dbus only used config files in /etc until 1.9.18
|
||||
%if %{pkg_vcmp dbus-1 < 1.9.18}
|
||||
%define _dbusconfigdir %{_sysconfdir}/dbus-1/system.d
|
||||
%else
|
||||
%define _dbusconfigdir %{_datadir}/dbus-1/system.d
|
||||
%endif
|
||||
# systemd only supports environment generators since version 233
|
||||
%if %{pkg_vcmp systemd < 233}
|
||||
%define support_environment_generators 0
|
||||
%else
|
||||
%define support_environment_generators 1
|
||||
%endif
|
||||
Name: flatpak
|
||||
Version: 1.15.8
|
||||
Release: 0
|
||||
Summary: OSTree based application bundles management
|
||||
License: LGPL-2.1-or-later
|
||||
Group: System/Packages
|
||||
URL: https://flatpak.github.io/
|
||||
Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||
Source1: update-system-flatpaks.service
|
||||
Source2: update-system-flatpaks.timer
|
||||
Source3: update-user-flatpaks.service
|
||||
Source4: update-user-flatpaks.timer
|
||||
Source5: https://flathub.org/repo/flathub.flatpakrepo
|
||||
# PATCH-FEATURE-OPENSUSE polkit_rules_usability.patch -- Make the rules comply with openSUSE expectations
|
||||
Patch0: polkit_rules_usability.patch
|
||||
# PATCH-FIX-UPSTREAM libglnx.patch https://gitlab.gnome.org/GNOME/libglnx/-/merge_requests/57
|
||||
Patch1: libglnx.patch
|
||||
|
||||
BuildRequires: bison
|
||||
BuildRequires: bubblewrap >= %{bubblewrap_version}
|
||||
BuildRequires: docbook-xsl-stylesheets
|
||||
BuildRequires: gtk-doc
|
||||
BuildRequires: intltool >= 0.35.0
|
||||
BuildRequires: libcap-devel
|
||||
BuildRequires: libgpg-error-devel
|
||||
BuildRequires: libgpgme-devel >= 1.1.8
|
||||
BuildRequires: libtool
|
||||
BuildRequires: meson
|
||||
BuildRequires: pkgconfig
|
||||
BuildRequires: python3-pyparsing
|
||||
BuildRequires: selinux-policy-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: sysuser-tools
|
||||
BuildRequires: xdg-dbus-proxy >= %{xdg_dbus_proxy_version}
|
||||
BuildRequires: xmlto
|
||||
BuildRequires: xsltproc
|
||||
BuildRequires: pkgconfig(appstream) >= 0.12.0
|
||||
BuildRequires: pkgconfig(dconf) >= 0.26
|
||||
BuildRequires: pkgconfig(fuse3) >= 3.1.1
|
||||
BuildRequires: pkgconfig(gdk-pixbuf-2.0)
|
||||
BuildRequires: pkgconfig(gio-2.0)
|
||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||
BuildRequires: pkgconfig(glib-2.0) >= 2.46
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0
|
||||
BuildRequires: pkgconfig(gobject-introspection-no-export-1.0) >= 1.40.0
|
||||
BuildRequires: pkgconfig(json-glib-1.0)
|
||||
BuildRequires: pkgconfig(libarchive) >= 2.8.0
|
||||
BuildRequires: pkgconfig(libcurl) >= 7.29.0
|
||||
BuildRequires: pkgconfig(libelf) >= 0.8.12
|
||||
BuildRequires: pkgconfig(libseccomp)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
BuildRequires: pkgconfig(libxml-2.0) >= 2.4
|
||||
BuildRequires: pkgconfig(libzstd) >= 0.8.1
|
||||
BuildRequires: pkgconfig(ostree-1) >= %{ostree_version}
|
||||
BuildRequires: pkgconfig(polkit-gobject-1)
|
||||
BuildRequires: pkgconfig(systemd)
|
||||
BuildRequires: pkgconfig(wayland-client) >= 1.15
|
||||
BuildRequires: pkgconfig(wayland-protocols) >= 1.32
|
||||
BuildRequires: pkgconfig(wayland-scanner) >= 1.15
|
||||
BuildRequires: pkgconfig(xau)
|
||||
Requires: %{libname} = %{version}
|
||||
Requires: bubblewrap >= %{bubblewrap_version}
|
||||
Requires: ostree >= %{ostree_version}
|
||||
Requires: xdg-dbus-proxy >= %{xdg_dbus_proxy_version}
|
||||
Requires: xdg-desktop-portal >= 0.10
|
||||
Requires: (flatpak-selinux = %{version} if selinux-policy-%{selinuxtype})
|
||||
Requires: user(flatpak)
|
||||
# as per documentation from flatpak 1.0: add weak dep on p11-kit-server for certificate transfer
|
||||
Recommends: p11-kit-server
|
||||
# Remove after openSUSE Leap 42 is out of scope
|
||||
Provides: xdg-app = %{version}
|
||||
Obsoletes: xdg-app < %{version}
|
||||
|
||||
%description
|
||||
flatpak is a system for building, distributing and running sandboxed desktop
|
||||
applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for
|
||||
more information.
|
||||
|
||||
%package -n system-user-flatpak
|
||||
Summary: System user for the flatpak system helper
|
||||
Group: System/Base
|
||||
BuildArch: noarch
|
||||
%sysusers_requires
|
||||
|
||||
%description -n system-user-flatpak
|
||||
System user for the flatpak system helper.
|
||||
|
||||
%package -n %{libname}
|
||||
Summary: OSTree based application bundle management library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n %{libname}
|
||||
flatpak is a system for building, distributing and running sandboxed desktop
|
||||
applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for
|
||||
more information.
|
||||
|
||||
%package -n typelib-1_0-Flatpak-1_0
|
||||
Summary: Introspection bindings for the flatpak library
|
||||
Group: System/Libraries
|
||||
|
||||
%description -n typelib-1_0-Flatpak-1_0
|
||||
flatpak is a system for building, distributing and running sandboxed desktop
|
||||
applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for
|
||||
more information.
|
||||
|
||||
%package zsh-completion
|
||||
Summary: Zsh tab-completion for flatpak
|
||||
Group: System/Shells
|
||||
Supplements: (%{name} and zsh)
|
||||
BuildArch: noarch
|
||||
|
||||
%description zsh-completion
|
||||
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 zsh tab-completion for flatpak.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for the flatpak library
|
||||
Group: Development/Languages/C and C++
|
||||
Requires: %{libname} = %{version}
|
||||
Requires: %{name} = %{version}
|
||||
Requires: typelib-1_0-Flatpak-1_0 = %{version}
|
||||
|
||||
%description devel
|
||||
flatpak is a system for building, distributing and running sandboxed desktop
|
||||
applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for
|
||||
more information.
|
||||
|
||||
%package remote-flathub
|
||||
Summary: Add Flathub repository to system flatpak
|
||||
Group: System/Packages
|
||||
Requires: flatpak
|
||||
Requires(postun): flatpak
|
||||
Requires(postun): sed
|
||||
%if 0%{?suse_version} > 1600
|
||||
Supplements: flatpak
|
||||
%endif
|
||||
BuildArch: noarch
|
||||
|
||||
%description remote-flathub
|
||||
Flathub is a widely used repository for Flatpak applications. This package
|
||||
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
|
||||
# upon uninstall
|
||||
if [ $1 == 0 ]; then
|
||||
# unregister the remote
|
||||
flatpak remote-delete --system flathub
|
||||
# and make sure it gets re-applied upon next install
|
||||
sed -i "/^xa\.applied-remotes=/s/flathub[;]*//" %{_localstatedir}/lib/flatpak/repo/config
|
||||
fi
|
||||
|
||||
%lang_package
|
||||
|
||||
%python3_fix_shebang
|
||||
|
||||
%prep
|
||||
%autosetup -p1
|
||||
sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-*
|
||||
|
||||
%build
|
||||
%meson \
|
||||
-Dsystem_bubblewrap=%{_bindir}/bwrap \
|
||||
-Dhttp_backend=curl \
|
||||
-Ddbus_config_dir=%{_dbusconfigdir} \
|
||||
-Dsystem_dbus_proxy=%{_bindir}/xdg-dbus-proxy \
|
||||
%if !%{support_environment_generators}
|
||||
-Dgdm_env_file=enabled \
|
||||
%endif
|
||||
-Dgtkdoc=enabled \
|
||||
-Dwayland_security_context=enabled \
|
||||
-Dselinux_module=enabled \
|
||||
-Dtests=false \
|
||||
-Dmalcontent=disabled \
|
||||
%{nil}
|
||||
%meson_build
|
||||
%sysusers_generate_pre system-helper/flatpak.conf system-user-flatpak flatpak.conf
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
find %{buildroot} -type f -name "*.la" -delete -print
|
||||
mkdir -p %{buildroot}%{_sbindir}
|
||||
ln -s service %{buildroot}%{_sbindir}/rcflatpak-system-helper
|
||||
# add a 60- prefix to the rules file, otherwise it is not effective, because
|
||||
# /etc/polkit-1/rules.d/90-default-privs.rules is executed first and if no
|
||||
# polkit-default-privs rule grants access then an explicit reject is the
|
||||
# result. This should fix bsc#984817, granting members of group wheel access
|
||||
# w/o password entry.
|
||||
mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules
|
||||
|
||||
%if !%{support_environment_generators}
|
||||
rm -Rf %{buildroot}%{_systemd_user_env_generator_dir}
|
||||
rm -Rf %{buildroot}%{_systemd_system_env_generator_dir}
|
||||
%endif
|
||||
|
||||
# System update Systemd service and timer units
|
||||
install -D -m 644 -t %{buildroot}%{_unitdir} %{SOURCE1}
|
||||
install -D -m 644 -t %{buildroot}%{_unitdir} %{SOURCE2}
|
||||
|
||||
# User update Systemd service and timer units
|
||||
install -D -m 644 -t %{buildroot}%{_userunitdir} %{SOURCE3}
|
||||
install -D -m 644 -t %{buildroot}%{_userunitdir} %{SOURCE4}
|
||||
|
||||
# Flathub remote repository
|
||||
install -D -m 644 -t %{buildroot}%{_sysconfdir}/flatpak/remotes.d %{SOURCE5}
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%pre -n system-user-flatpak -f system-user-flatpak.pre
|
||||
%post -n %{libname} -p /sbin/ldconfig
|
||||
%postun -n %{libname} -p /sbin/ldconfig
|
||||
|
||||
%pre
|
||||
%service_add_pre flatpak-system-helper.service
|
||||
%service_add_pre update-system-flatpaks.service
|
||||
%service_add_pre update-system-flatpaks.timer
|
||||
|
||||
%preun
|
||||
%service_del_preun flatpak-system-helper.service
|
||||
%service_del_preun update-system-flatpaks.service
|
||||
%service_del_preun update-system-flatpaks.timer
|
||||
|
||||
%post
|
||||
%service_add_post flatpak-system-helper.service
|
||||
%service_add_post update-system-flatpaks.service
|
||||
%service_add_post update-system-flatpaks.timer
|
||||
# Remove any empty repo directory, which is seen as invalid by flatpak. After that, create a skeleton repository using "flatpak remotes".
|
||||
if [ -e "%{_localstatedir}/lib/flatpak/repo" ] && [ -z "$(ls -A %{_localstatedir}/lib/flatpak/repo)" ]; then
|
||||
rm -r %{_localstatedir}/lib/flatpak/repo
|
||||
fi
|
||||
%{_bindir}/flatpak remotes 1> /dev/null
|
||||
%tmpfiles_create %{_tmpfilesdir}/flatpak.conf
|
||||
|
||||
%postun
|
||||
%service_del_postun flatpak-system-helper.service
|
||||
%service_del_postun update-system-flatpaks.service
|
||||
%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
|
||||
%license COPYING
|
||||
%{_bindir}/flatpak
|
||||
%{_libexecdir}/flatpak-portal
|
||||
%{_libexecdir}/flatpak-session-helper
|
||||
%{_libexecdir}/flatpak-system-helper
|
||||
%{_libexecdir}/flatpak-validate-icon
|
||||
%{_libexecdir}/revokefs-fuse
|
||||
%{_datadir}/bash-completion/completions/flatpak
|
||||
%dir %{_datadir}/fish
|
||||
%dir %{_datadir}/fish/vendor_conf.d
|
||||
%{_datadir}/fish/vendor_conf.d/flatpak.fish
|
||||
%dir %{_datadir}/fish/vendor_completions.d
|
||||
%{_datadir}/fish/vendor_completions.d/flatpak.fish
|
||||
# # Own dirs so we don't have to depend on dbus for building.
|
||||
%dir %{_datadir}/dbus-1
|
||||
%dir %{_datadir}/dbus-1/interfaces
|
||||
%dir %{_datadir}/dbus-1/services
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.Flatpak.service
|
||||
%{_datadir}/dbus-1/services/org.freedesktop.portal.Flatpak.service
|
||||
%{_datadir}/dbus-1/system-services/org.freedesktop.Flatpak.SystemHelper.service
|
||||
%{_dbusconfigdir}/org.freedesktop.Flatpak.SystemHelper.conf
|
||||
# policykit rules
|
||||
%{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
|
||||
%{_datadir}/polkit-1/rules.d/60-org.freedesktop.Flatpak.rules
|
||||
%{_mandir}/man1/%{name}*.1%{?ext_man}
|
||||
%{_mandir}/man5/flatpak-metadata.5%{?ext_man}
|
||||
%{_mandir}/man5/flatpak-flatpakref.5%{?ext_man}
|
||||
%{_mandir}/man5/flatpakref.5%{?ext_man}
|
||||
%{_mandir}/man5/flatpak-flatpakrepo.5%{?ext_man}
|
||||
%{_mandir}/man5/flatpakrepo.5%{?ext_man}
|
||||
%{_mandir}/man5/flatpak-installation.5%{?ext_man}
|
||||
%{_mandir}/man5/flatpak-remote.5%{?ext_man}
|
||||
%{_datadir}/%{name}/
|
||||
%config %{_sysconfdir}/profile.d/flatpak.sh
|
||||
%dir %{_sysconfdir}/flatpak
|
||||
%dir %{_sysconfdir}/flatpak/remotes.d
|
||||
%{_unitdir}/flatpak-system-helper.service
|
||||
%{_unitdir}/update-system-flatpaks.{service,timer}
|
||||
%{_userunitdir}/update-user-flatpaks.{service,timer}
|
||||
%{_sbindir}/rcflatpak-system-helper
|
||||
%{_userunitdir}/flatpak-session-helper.service
|
||||
%{_userunitdir}/flatpak-portal.service
|
||||
%ghost %dir %{_localstatedir}/lib/flatpak
|
||||
%if %{support_environment_generators}
|
||||
%dir %{_systemd_user_env_generator_dir}
|
||||
%{_systemd_user_env_generator_dir}/60-flatpak
|
||||
%{_systemd_system_env_generator_dir}/60-flatpak-system-only
|
||||
%else
|
||||
# Own dirs so we don't have to depend on gdm for building.
|
||||
%dir %{_datadir}/gdm/
|
||||
%dir %{_datadir}/gdm/env.d/
|
||||
%{_datadir}/gdm/env.d/flatpak.env
|
||||
%endif
|
||||
%{_libexecdir}/flatpak-oci-authenticator
|
||||
%{_userunitdir}/flatpak-oci-authenticator.service
|
||||
%{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.Authenticator.xml
|
||||
%{_datadir}/dbus-1/services/org.flatpak.Authenticator.Oci.service
|
||||
%{_tmpfilesdir}/flatpak.conf
|
||||
|
||||
%files -n system-user-flatpak
|
||||
%license COPYING
|
||||
%{_sysusersdir}/flatpak.conf
|
||||
|
||||
%files -n %{libname}
|
||||
%license COPYING
|
||||
%{_libdir}/libflatpak.so.*
|
||||
|
||||
%files -n typelib-1_0-Flatpak-1_0
|
||||
%license COPYING
|
||||
%{_libdir}/girepository-1.0/Flatpak-1.0.typelib
|
||||
|
||||
%files zsh-completion
|
||||
%license COPYING
|
||||
%dir %{_datadir}/zsh/site-functions
|
||||
%{_datadir}/zsh/site-functions/_flatpak
|
||||
|
||||
%files devel
|
||||
%license COPYING
|
||||
%doc %{_datadir}/gtk-doc/html/flatpak
|
||||
%dir %{_datadir}/doc/flatpak
|
||||
%doc %{_datadir}/doc/flatpak/docbook.css
|
||||
%doc %{_datadir}/doc/flatpak/flatpak-docs.html
|
||||
%{_bindir}/flatpak-bisect
|
||||
%{_bindir}/flatpak-coredumpctl
|
||||
%{_libdir}/pkgconfig/flatpak.pc
|
||||
%{_includedir}/%{name}/
|
||||
%{_libdir}/libflatpak.so
|
||||
%{_datadir}/gir-1.0/Flatpak-1.0.gir
|
||||
|
||||
%files remote-flathub
|
||||
%config %{_sysconfdir}/flatpak/remotes.d/flathub.flatpakrepo
|
||||
|
||||
%files selinux
|
||||
%{_datadir}/selinux/devel/include/contrib/flatpak.if
|
||||
%{_datadir}/selinux/packages/flatpak.pp.bz2
|
||||
|
||||
%changelog
|
||||
13
libglnx.patch
Normal file
13
libglnx.patch
Normal file
@ -0,0 +1,13 @@
|
||||
Index: flatpak-1.15.8/subprojects/libglnx/meson.build
|
||||
===================================================================
|
||||
--- flatpak-1.15.8.orig/subprojects/libglnx/meson.build
|
||||
+++ flatpak-1.15.8/subprojects/libglnx/meson.build
|
||||
@@ -40,7 +40,7 @@ foreach check_function : check_functions
|
||||
#include <linux/random.h>
|
||||
#include <sys/mman.h>
|
||||
|
||||
- int func (void) {
|
||||
+ void func (void) {
|
||||
(void) ''' + check_function + ''';
|
||||
}
|
||||
''',
|
||||
16
polkit_rules_usability.patch
Normal file
16
polkit_rules_usability.patch
Normal file
@ -0,0 +1,16 @@
|
||||
Index: flatpak-0.11.8.3/system-helper/org.freedesktop.Flatpak.rules.in
|
||||
===================================================================
|
||||
--- flatpak-0.11.8.3.orig/system-helper/org.freedesktop.Flatpak.rules.in
|
||||
+++ flatpak-0.11.8.3/system-helper/org.freedesktop.Flatpak.rules.in
|
||||
@@ -3,7 +3,10 @@ polkit.addRule(function(action, subject)
|
||||
action.id == "org.freedesktop.Flatpak.runtime-install"||
|
||||
action.id == "org.freedesktop.Flatpak.app-uninstall" ||
|
||||
action.id == "org.freedesktop.Flatpak.runtime-uninstall" ||
|
||||
- action.id == "org.freedesktop.Flatpak.modify-repo") &&
|
||||
+ action.id == "org.freedesktop.Flatpak.modify-repo" ||
|
||||
+ action.id == "org.freedesktop.Flatpak.app-update" ||
|
||||
+ action.id == "org.freedesktop.Flatpak.runtime-update" ||
|
||||
+ action.id == "org.freedesktop.Flatpak.appstream-update") &&
|
||||
subject.active == true && subject.local == true &&
|
||||
subject.isInGroup("@privileged_group@")) {
|
||||
return polkit.Result.YES;
|
||||
12
update-system-flatpaks.service
Normal file
12
update-system-flatpaks.service
Normal file
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Update system Flatpaks
|
||||
Documentation=man:flatpak-update(1)
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/flatpak --system update -y --noninteractive
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
10
update-system-flatpaks.timer
Normal file
10
update-system-flatpaks.timer
Normal file
@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Update system Flatpaks daily
|
||||
Documentation=man:flatpak-update(1)
|
||||
|
||||
[Timer]
|
||||
OnCalendar=daily
|
||||
Persistent=true
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
12
update-user-flatpaks.service
Normal file
12
update-user-flatpaks.service
Normal file
@ -0,0 +1,12 @@
|
||||
[Unit]
|
||||
Description=Update user Flatpaks
|
||||
Documentation=man:flatpak-update(1)
|
||||
After=network-online.target
|
||||
Wants=network-online.target
|
||||
|
||||
[Service]
|
||||
Type=oneshot
|
||||
ExecStart=/usr/bin/flatpak --user update -y --noninteractive
|
||||
|
||||
[Install]
|
||||
WantedBy=default.target
|
||||
10
update-user-flatpaks.timer
Normal file
10
update-user-flatpaks.timer
Normal file
@ -0,0 +1,10 @@
|
||||
[Unit]
|
||||
Description=Update user Flatpaks daily
|
||||
Documentation=man:flatpak-update(1)
|
||||
|
||||
[Timer]
|
||||
OnCalendar=daily
|
||||
Persistent=true
|
||||
|
||||
[Install]
|
||||
WantedBy=timers.target
|
||||
Loading…
Reference in New Issue
Block a user