From b201025e5e7b114994bba56d3a9fd7cc60044c09 Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 5 Jan 2024 22:26:41 +0100 Subject: [PATCH] add flatpak export bindir to PATH; add default flathub repo in global configuration [release 1.12.2-2mamba;Sun Nov 14 2021] --- flathub.flatpakrepo | 8 ++++++++ flatpak.spec | 31 +++++++++++++++++++++++++------ 2 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 flathub.flatpakrepo diff --git a/flathub.flatpakrepo b/flathub.flatpakrepo new file mode 100644 index 0000000..99c4786 --- /dev/null +++ b/flathub.flatpakrepo @@ -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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 diff --git a/flatpak.spec b/flatpak.spec index 4a916c2..e0fc032 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -1,14 +1,14 @@ Name: flatpak Version: 1.12.2 -Release: 1mamba +Release: 2mamba Summary: Linux application sandboxing and distribution framework Group: System/Management Vendor: openmamba Distribution: openmamba Packager: Silvan Calarco URL: https://flatpak.org -## GITSOURCE https://github.com/flatpak/flatpak.git 1.4.2 Source: https://github.com/flatpak/flatpak.git/%{version}/flatpak-%{version}.tar.bz2 +Source1: https://dl.flathub.org/repo/flathub.flatpakrepo License: LGPL ## AUTOBUILDREQ-BEGIN BuildRequires: glibc-devel @@ -42,7 +42,7 @@ BuildRequires: libostree-devel BuildRequires: libpolkit-devel BuildRequires: libseccomp-devel BuildRequires: libselinux-devel -BuildRequires: libsoup-devel +BuildRequires: libsoup2-devel BuildRequires: libssp-devel BuildRequires: libsystemd-devel BuildRequires: libxml2-devel @@ -82,7 +82,12 @@ This package contains libraries and header files for developing applications tha NOCONFIGURE=1 ./autogen.sh %configure \ - --with-systemdsystemunitdir=%{_unitdir} + --with-dbus-config-dir=%{_datadir}/dbus-1/system.d \ + --with-systemdsystemunitdir=%{_unitdir} + +# TODO: +# --with-system-bubblewrap \ +# --with-system-dbus-proxy \ %make @@ -90,6 +95,14 @@ NOCONFIGURE=1 ./autogen.sh [ "%{buildroot}" != / ] && rm -rf "%{buildroot}" %makeinstall +install -D -m0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/flatpak/remotes.d/flathub.flatpakrepo + +install -d -m0755 %{buildroot}%{_sysconfdir}/profile.d +cat > %{buildroot}%{_sysconfdir}/profile.d/flatpak-bindir.sh << _EOF +export PATH=\$PATH:/var/lib/flatpak/exports/bin +_EOF + + %find_lang %{name} || touch %{name}.lang %clean @@ -100,7 +113,10 @@ NOCONFIGURE=1 ./autogen.sh %files -f %{name}.lang %defattr(-,root,root) -%{_sysconfdir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf +%{_sysconfdir}/profile.d/flatpak-bindir.sh +%dir %{_sysconfdir}/flatpak +%dir %{_sysconfdir}/flatpak/remotes.d +%{_sysconfdir}/flatpak/remotes.d/flathub.flatpakrepo %{_sysconfdir}/profile.d/flatpak.sh %{_bindir}/flatpak %{_bindir}/flatpak-bisect @@ -113,6 +129,7 @@ NOCONFIGURE=1 ./autogen.sh %{_userunitdir}/flatpak-oci-authenticator.service %{_sysusersdir}/flatpak.conf %{_datadir}/bash-completion/completions/flatpak +%{_datadir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf %{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml %{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.Authenticator.xml @@ -126,7 +143,6 @@ NOCONFIGURE=1 ./autogen.sh %dir %{_datadir}/flatpak %dir %{_datadir}/flatpak/triggers %{_datadir}/flatpak/triggers/*.trigger -#%{_datadir}/gdm/env.d/flatpak.env %{_mandir}/man1/flatpak*.1* %{_mandir}/man5/flatpak-*.5* %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy @@ -152,6 +168,9 @@ NOCONFIGURE=1 ./autogen.sh %doc NEWS README.md %changelog +* Sun Nov 14 2021 Silvan Calarco 1.12.2-2mamba +- add flatpak export bindir to PATH; add default flathub repo in global configuration + * Thu Oct 14 2021 Automatic Build System 1.12.2-1mamba - automatic version update by autodist