- up to 0.6.14

diff --git a/flatpak-0.6.14-fix-gnome-software-crash.patch b/flatpak-0.6.14-fix-gnome-software-crash.patch
new file mode 100644 (file)
index 0000000..83b4f55
--- /dev/null
+++ b/flatpak-0.6.14-fix-gnome-software-crash.patch
@@ -0,0 +1,30 @@
+From 31ca19eb99dbd588a1995898ab1baf6cef2180d6 Mon Sep 17 00:00:00 2001
+From: Alexander Larsson <alexl@redhat.com>
+Date: Tue, 29 Nov 2016 16:59:48 +0100
+Subject: [PATCH] pull: Exit early on error without aborting transaction
+
+At this point we have not set up repo yet, so aborting would crash.
+---
+ common/flatpak-dir.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/common/flatpak-dir.c b/common/flatpak-dir.c
+index 8213440..1094cf4 100644
+--- a/common/flatpak-dir.c
++++ b/common/flatpak-dir.c
+@@ -1563,13 +1563,13 @@ flatpak_dir_pull (FlatpakDir          *self,
+   g_autoptr(GPtrArray) subdirs_arg = NULL;
+ 
+   if (!flatpak_dir_ensure_repo (self, cancellable, error))
+-    goto out;
++    return FALSE;
+ 
+   if (!ostree_repo_remote_get_url (self->repo,
+                                    repository,
+                                    &url,
+                                    error))
+-    goto out;
++    return FALSE;
+ 
+   if (*url == 0)
+     return TRUE; /* Empty url, silently disables updates */

diff --git a/flatpak.spec b/flatpak.spec
index f60c7621e90cf79f97535d80981dea7f7b77452a..7344ac013a49d52e2bc71ec8f6f434f55abb7959 100644 (file)
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -5,13 +5,14 @@
 Summary:       Application deployment framework for desktop apps
 Summary(pl.UTF-8):     Szkielet do wdrażania aplikacji desktopowych
 Name:          flatpak
-Version:       0.6.0
-Release:       2
+Version:       0.6.14
+Release:       1
 License:       LGPL v2+
 Group:         Applications
-Source0:       https://www.freedesktop.org/software/xdg-app/releases/%{name}-%{version}.tar.xz
-# Source0-md5: f05a83ff119dffef39a77a34fa50e754
-URL:           https://wiki.gnome.org/Projects/SandboxedApps
+Source0:        https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
+# Source0-md5: bf209efdeebe86976dca45d1b7226876
+Patch0:         flatpak-0.6.14-fix-gnome-software-crash.patch
+URL:            http://flatpak.org/
 BuildRequires: docbook-dtd412-xml
 BuildRequires: docbook-style-xsl
 # or libelf >= 0.8.12
@@ -28,7 +29,7 @@ BuildRequires:        libgsystem-devel >= 2015.1
 BuildRequires: libseccomp-devel
 BuildRequires: libsoup-devel >= 2.4
 BuildRequires: libxslt-progs
-BuildRequires: ostree-devel >= 2016.5
+BuildRequires: ostree-devel >= 2016.14
 BuildRequires: pkgconfig >= 1:0.24
 BuildRequires: polkit-devel >= 0.98
 BuildRequires: rpmbuild(macros) >= 1.682
@@ -36,7 +37,7 @@ BuildRequires:        tar >= 1:1.22
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xz
 Requires:      libgsystem >= 2015.1
-Requires:      ostree >= 2016.5
+Requires:      ostree >= 2016.14
 Obsoletes:     xdg-app < 0.6.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -146,13 +147,12 @@ rm -rf $RPM_BUILD_ROOT
 %doc NEWS
 %attr(755,root,root) %{_bindir}/flatpak
 %attr(755,root,root) %{_bindir}/flatpak-builder
-%attr(755,root,root) %{_libexecdir}/flatpak-dbus-proxy
-%attr(755,root,root) %{_libexecdir}/flatpak-session-helper
-%attr(755,root,root) %{_libexecdir}/flatpak-system-helper
-%attr(755,root,root) %{_libexecdir}/xdg-document-portal
-%attr(755,root,root) %{_libexecdir}/xdg-permission-store
-%dir %{_libdir}/flatpak
-%attr(755,root,root) %{_libdir}/flatpak/bwrap
+%attr(755,root,root) %{_libdir}/flatpak-bwrap
+%attr(755,root,root) %{_libdir}/flatpak-dbus-proxy
+%attr(755,root,root) %{_libdir}/flatpak-session-helper
+%attr(755,root,root) %{_libdir}/flatpak-system-helper
+%attr(755,root,root) %{_libdir}/xdg-document-portal
+%attr(755,root,root) %{_libdir}/xdg-permission-store
 %attr(755,root,root) /etc/profile.d/flatpak.sh
 /etc/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
 %{_datadir}/dbus-1/services/org.freedesktop.Flatpak.service
@@ -162,6 +162,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
 %{_datadir}/polkit-1/rules.d/org.freedesktop.Flatpak.rules
 %{systemdunitdir}/flatpak-system-helper.service
+#%{systemduserunitdir}/dbus.service.d/flatpak.conf
 %{systemduserunitdir}/flatpak-session-helper.service
 %{systemduserunitdir}/xdg-document-portal.service
 %{systemduserunitdir}/xdg-permission-store.service
@@ -171,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/flatpak/triggers
 %attr(755,root,root) %{_datadir}/flatpak/triggers/*.trigger
 %{_mandir}/man1/flatpak*.1*
+%{_mandir}/man5/flatpak-flatpakref.5*
+%{_mandir}/man5/flatpak-flatpakrepo.5*
+%{_mandir}/man5/flatpak-metadata.5*
 
 %files libs
 %defattr(644,root,root,755)