Accepting request 760030 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/760030
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flatpak?expand=0&rev=37

_service

@@ -1,9 +1,10 @@
+<?xml version="1.0"?>
 <services>
   <service name="tar_scm" mode="disabled">
     <param name="url">https://github.com/flatpak/flatpak.git</param>
     <param name="scm">git</param>
     <param name="versionformat">@PARENT_TAG@</param>
-    <param name="revision">refs/tags/1.4.3</param>
+    <param name="revision">refs/tags/1.6.0</param>
   </service>
   <service name="recompress" mode="disabled">
     <param name="file">*.tar</param>

flatpak-1.4.3.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:112da26c1e12a816239f1ce496d801f35d1ae55b99caae7c4421e087988d2802
-size 905056

flatpak-1.6.0.tar.xz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:1376e4fe3f9c7594a4534d01d5331a38a3e71392c9a46d529130386529ae3ae0
+size 971432

flatpak.changes

@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Mon Dec 30 10:00:24 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- 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 <dimstar@opensuse.org>
+
+- 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 <bjorn.lie@gmail.com>
+
+- 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 <fcrozat@suse.com>
 

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
+%autosetup -p1
-%patch0 -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 \
+	--disable-silent-rules \
-    --enable-gtk-doc \
+	--enable-gtk-doc \
-    --disable-document-portal \
+	--disable-document-portal \
-    --with-system-bubblewrap \
+	--with-system-bubblewrap \
-    --with-priv-mode=none \
+	--with-priv-mode=none \
-    --with-dbus-config-dir=%{_dbusconfigdir}
+	--with-dbus-config-dir=%{_dbusconfigdir} \
-make %{?_smp_mflags}
+	%{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