From 283dcd0a58b4f2b8777c80ca886aa28920b9982fbf45c1983938c0c1953121e6 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 20 Jul 2020 08:48:34 +0000 Subject: [PATCH] Accepting request 820005 from GNOME:Next OBS-URL: https://build.opensuse.org/request/show/820005 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=116 --- _service | 2 +- flatpak-1.6.4.tar.xz | 3 --- flatpak-1.8.1.tar.xz | 3 +++ flatpak.changes | 33 +++++++++++++++++++++++++++++++++ flatpak.spec | 33 +++++++++++++++++++-------------- system-user-flatpak.conf | 4 ---- 6 files changed, 56 insertions(+), 22 deletions(-) delete mode 100644 flatpak-1.6.4.tar.xz create mode 100644 flatpak-1.8.1.tar.xz delete mode 100644 system-user-flatpak.conf diff --git a/_service b/_service index 895e3f2..8e98ddb 100644 --- a/_service +++ b/_service @@ -4,7 +4,7 @@ https://github.com/flatpak/flatpak.git git @PARENT_TAG@ - refs/tags/1.6.4 + refs/tags/1.8.1 *.tar diff --git a/flatpak-1.6.4.tar.xz b/flatpak-1.6.4.tar.xz deleted file mode 100644 index 2b6b1e5..0000000 --- a/flatpak-1.6.4.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:55fe560a3f872a8e8c523e73d6ada288c94adf84145d39f91a1e524e0595fad0 -size 992464 diff --git a/flatpak-1.8.1.tar.xz b/flatpak-1.8.1.tar.xz new file mode 100644 index 0000000..8427748 --- /dev/null +++ b/flatpak-1.8.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c698279eda9519816f762a2988cfb42b0cc87db7938c697e556037690c56026e +size 1045124 diff --git a/flatpak.changes b/flatpak.changes index b6a2c2b..86c4e8c 100644 --- a/flatpak.changes +++ b/flatpak.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Fri Jul 10 08:55:59 UTC 2020 - Antonio Larrosa + +- Update to version 1.8.1: + * Avoid calling authenticator in update if ref didn't change + * Don't fail transaction if ref is already installed (after + transaction start) + * Fix flatpak run handling of userns in the --device=all case + * Fix handling of extensions from different remotes + * Fix flatpak run --no-session-bus + * Updated translations + +- Update to version 1.8.0: + * FlatpakTransaction has a new signal "install-authenticator" + which clients can handle to install authenticators needed for + the transaction. This is done in the CLI commands. + * We now always expose the host timezone data, allowing us the + expose the host /etc/localtime in a way that works better, + fixing several apps that had timezone issues. + * Fix flatpak enter which didn't work in some cases. + * We now ship a systemd unit (not installed by default) to + automatically detect plugged in usb sticks with sideload repos. + * By default we no longer install the gdm env.d file, as the + systemd generators work better. + * create-usb now exports partial commits by default + * Fix handling of docker media types in oci remotes + * Fix subjects in remote-info --log output + +- Remove source file used to generate a flatpak user on the system + since it's now included by upstream: + * system-user-flatpak.conf + ------------------------------------------------------------------- Tue Jul 7 10:26:44 UTC 2020 - Callum Farmer @@ -197,6 +229,7 @@ Wed Jul 3 08:27:20 UTC 2019 - Antonio Larrosa * Support extra_data in extensions. * Handle double slashes ("//") in XDG_DATA_DIRS. * Fix detection of local related refs. +- jsc#SLE-7171 ------------------------------------------------------------------- Thu Jun 14 09:33:16 UTC 2019 - Antonio Larrosa diff --git a/flatpak.spec b/flatpak.spec index 79452c5..9599de4 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -32,14 +32,13 @@ %define libname libflatpak0 Name: flatpak -Version: 1.6.4 +Version: 1.8.1 Release: 0 Summary: OSTree based application bundles management License: LGPL-2.1-or-later Group: System/Packages URL: https://flatpak.github.io/ Source0: %{name}-%{version}.tar.xz -Source1: system-user-flatpak.conf Patch0: polkit_rules_usability.patch BuildRequires: bison BuildRequires: bubblewrap >= 0.4.1 @@ -48,6 +47,7 @@ BuildRequires: gtk-doc BuildRequires: intltool >= 0.35.0 BuildRequires: libcap-devel BuildRequires: libdwarf-devel +BuildRequires: libgpg-error-devel BuildRequires: libgpgme-devel >= 1.1.8 BuildRequires: libtool BuildRequires: pkgconfig @@ -55,11 +55,11 @@ BuildRequires: sysuser-tools BuildRequires: xdg-dbus-proxy >= 0.1.0 BuildRequires: xsltproc BuildRequires: pkgconfig(appstream-glib) -BuildRequires: pkgconfig(dconf) -BuildRequires: pkgconfig(fuse) +BuildRequires: pkgconfig(dconf) >= 0.26 +BuildRequires: pkgconfig(fuse) >= 2.9.2 BuildRequires: pkgconfig(gio-2.0) BuildRequires: pkgconfig(gio-unix-2.0) -BuildRequires: pkgconfig(glib-2.0) >= 2.44 +BuildRequires: pkgconfig(glib-2.0) >= 2.60 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) @@ -68,6 +68,7 @@ BuildRequires: pkgconfig(libelf) >= 0.8.12 BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsystemd) +BuildRequires: pkgconfig(libzstd) >= 0.8.1 BuildRequires: pkgconfig(ostree-1) >= 2018.9 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(systemd) @@ -155,9 +156,12 @@ NOCONFIGURE=1 ./autogen.sh --with-priv-mode=none \ --with-dbus-config-dir=%{_dbusconfigdir} \ --with-system-dbus-proxy=%{_bindir}/xdg-dbus-proxy \ +%if !%{support_environment_generators} + --enable-gdm-env-file \ +%endif %{nil} %make_build -%sysusers_generate_pre %{SOURCE1} system-user-flatpak +%sysusers_generate_pre system-helper/flatpak.conf system-user-flatpak %install %make_install @@ -171,9 +175,6 @@ ln -s service %{buildroot}%{_sbindir}/rcflatpak-system-helper # w/o password entry. mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules -mkdir -p %{buildroot}%{_sysusersdir} -install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-flatpak.conf - %if !%{support_environment_generators} rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/ %endif @@ -214,6 +215,9 @@ fi %{_libexecdir}/flatpak-validate-icon %{_libexecdir}/revokefs-fuse %{_datadir}/bash-completion/completions/flatpak +%dir %{_datadir}/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 @@ -236,10 +240,6 @@ fi %{_datadir}/%{name}/ %config %{_sysconfdir}/profile.d/flatpak.sh %{_sysconfdir}/flatpak -# 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 %{_unitdir}/flatpak-system-helper.service %{_sbindir}/rcflatpak-system-helper %{_userunitdir}/flatpak-session-helper.service @@ -248,6 +248,11 @@ fi %if %{support_environment_generators} %dir %{_prefix}/lib/systemd/user-environment-generators %{_prefix}/lib/systemd/user-environment-generators/60-flatpak +%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 @@ -255,7 +260,7 @@ fi %{_datadir}/dbus-1/services/org.flatpak.Authenticator.Oci.service %files -n system-user-flatpak -%{_sysusersdir}/system-user-flatpak.conf +%{_sysusersdir}/flatpak.conf %files -n %{libname} %{_libdir}/libflatpak.so.* diff --git a/system-user-flatpak.conf b/system-user-flatpak.conf deleted file mode 100644 index 26b0ca9..0000000 --- a/system-user-flatpak.conf +++ /dev/null @@ -1,4 +0,0 @@ -# Type Name ID GECOS [HOME] - -u flatpak - "User for flatpak system helper" -