From 1be2588aeea45b1028f1a09ef5a4a328e6f3339565d4ceb59739d9ab8e8dca7c Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Mon, 30 Dec 2019 11:54:17 +0000 Subject: [PATCH] Accepting request 760017 from GNOME:Next - Change %_prefix/lib to %_libexecdir: Makefile installs the file explicitly into libexecdir. Let's be ready in case this path is going to change. - Co-own /usr/lib/systemd/user-environment-generators. We don't want to forcibly pull in systemd into the buildroot just to own this directory. - Update to version 1.6.0: + This is the first stable release in the 1.6 series, main changes since 1.4 is the support for protected content and improvements in the self-sandboxing support. + There is one change in the support for OCI remotes, we now only support the use of labels, not annotations, as labels work with more registries. This means pre-existing OCI flatpak registries (like fedora) may need some changes. + New permissions --socket=cups for direct cups access. + Fix some leaks. + Fix reporting of progress with latest version of ostree. + New no-interaction flag for authenticators. + Support for auto-installing authenticators from a flatpak remote. + Warn less about unset XDG_DATA_DIRS. + Don't poll for updates in the portal when on a metered connection. - Modernize spec with current macros. OBS-URL: https://build.opensuse.org/request/show/760017 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=91 --- _service | 3 ++- flatpak-1.4.3.tar.xz | 3 --- flatpak-1.6.0.tar.xz | 3 +++ flatpak.changes | 36 ++++++++++++++++++++++++++++++++++++ flatpak.spec | 32 +++++++++++++++++--------------- 5 files changed, 58 insertions(+), 19 deletions(-) delete mode 100644 flatpak-1.4.3.tar.xz create mode 100644 flatpak-1.6.0.tar.xz diff --git a/_service b/_service index 4c0e4a1..fd27451 100644 --- a/_service +++ b/_service @@ -1,9 +1,10 @@ + https://github.com/flatpak/flatpak.git git @PARENT_TAG@ - refs/tags/1.4.3 + refs/tags/1.6.0 *.tar diff --git a/flatpak-1.4.3.tar.xz b/flatpak-1.4.3.tar.xz deleted file mode 100644 index 3626f1d..0000000 --- a/flatpak-1.4.3.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:112da26c1e12a816239f1ce496d801f35d1ae55b99caae7c4421e087988d2802 -size 905056 diff --git a/flatpak-1.6.0.tar.xz b/flatpak-1.6.0.tar.xz new file mode 100644 index 0000000..b46dd98 --- /dev/null +++ b/flatpak-1.6.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1376e4fe3f9c7594a4534d01d5331a38a3e71392c9a46d529130386529ae3ae0 +size 971432 diff --git a/flatpak.changes b/flatpak.changes index ab138b1..2c0001b 100644 --- a/flatpak.changes +++ b/flatpak.changes @@ -1,3 +1,39 @@ +------------------------------------------------------------------- +Mon Dec 30 10:00:24 UTC 2019 - Dominique Leuenberger + +- Change %_prefix/lib to %_libexecdir: Makefile installs the file + explicitly into libexecdir. Let's be ready in case this path is + going to change. + +------------------------------------------------------------------- +Fri Dec 27 10:23:14 UTC 2019 - Dominique Leuenberger + +- Co-own /usr/lib/systemd/user-environment-generators. We don't + want to forcibly pull in systemd into the buildroot just to own + this directory. + +------------------------------------------------------------------- +Fri Dec 20 22:44:39 UTC 2019 - Bjørn Lie + +- Update to version 1.6.0: + + This is the first stable release in the 1.6 series, main + changes since 1.4 is the support for protected content and + improvements in the self-sandboxing support. + + There is one change in the support for OCI remotes, we now only + support the use of labels, not annotations, as labels work with + more registries. This means pre-existing OCI flatpak registries + (like fedora) may need some changes. + + New permissions --socket=cups for direct cups access. + + Fix some leaks. + + Fix reporting of progress with latest version of ostree. + + New no-interaction flag for authenticators. + + Support for auto-installing authenticators from a flatpak + remote. + + Warn less about unset XDG_DATA_DIRS. + + Don't poll for updates in the portal when on a metered + connection. +- Modernize spec with current macros. + ------------------------------------------------------------------- Mon Nov 25 16:59:29 UTC 2019 - Frederic Crozat diff --git a/flatpak.spec b/flatpak.spec index 4e57872..cac0b61 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -1,7 +1,7 @@ # # spec file for package flatpak # -# Copyright (c) 2019 SUSE LLC. +# Copyright (c) 2019 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,7 +32,7 @@ %define libname libflatpak0 Name: flatpak -Version: 1.4.3 +Version: 1.6.0 Release: 0 Summary: OSTree based application bundles management License: LGPL-2.1-or-later @@ -42,7 +42,7 @@ Source0: %{name}-%{version}.tar.xz Source1: system-user-flatpak.conf Patch0: polkit_rules_usability.patch BuildRequires: bison -BuildRequires: bubblewrap >= 0.2.1 +BuildRequires: bubblewrap >= 0.4.0 BuildRequires: docbook-xsl-stylesheets BuildRequires: gtk-doc BuildRequires: intltool >= 0.35.0 @@ -140,24 +140,21 @@ more information. %lang_package %prep -%setup -q -%patch0 -p1 +%autosetup -p1 sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-* -# UPSTREAM: https://github.com/flatpak/flatpak/pull/2963 -mv doc/reference/libflapak-docs.xml doc/reference/libflatpak-docs.xml - %build %define _lto_cflags %{nil} NOCONFIGURE=1 ./autogen.sh %configure \ - --disable-silent-rules \ - --enable-gtk-doc \ - --disable-document-portal \ - --with-system-bubblewrap \ - --with-priv-mode=none \ - --with-dbus-config-dir=%{_dbusconfigdir} -make %{?_smp_mflags} + --disable-silent-rules \ + --enable-gtk-doc \ + --disable-document-portal \ + --with-system-bubblewrap \ + --with-priv-mode=none \ + --with-dbus-config-dir=%{_dbusconfigdir} \ + %{nil} +%make_build %sysusers_generate_pre %{SOURCE1} system-user-flatpak %install @@ -243,8 +240,13 @@ mkdir -p %{buildroot}%{_sysconfdir}/flatpak/remotes.d %{_userunitdir}/flatpak-portal.service %ghost %dir %{_localstatedir}/lib/flatpak %if %{support_environment_generators} +%dir %{_libexecdir}/systemd/user-environment-generators %{_libexecdir}/systemd/user-environment-generators/60-flatpak %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 %files -n system-user-flatpak %{_sysusersdir}/system-user-flatpak.conf