diff --git a/flatpak-1.0.0-fix-docs-for-gdbus-codegen.patch b/flatpak-1.0.0-fix-docs-for-gdbus-codegen.patch new file mode 100644 index 0000000..80b85e8 --- /dev/null +++ b/flatpak-1.0.0-fix-docs-for-gdbus-codegen.patch @@ -0,0 +1,34 @@ +From 7b8e9ea4a17ccaf3418c48294ae13b784d19cb63 Mon Sep 17 00:00:00 2001 +From: Alexander Larsson +Date: Mon, 20 Aug 2018 14:56:00 +0200 +Subject: [PATCH] dbus xml: Delete -- from docs + +Apparently -- is not valid XML, so a nonbreakable space was added, but +that breaks gdbus-codegen, so lets just drop the dashes totally. + +Closes: #1988 +Approved by: alexlarsson +--- + data/org.freedesktop.portal.Flatpak.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/data/org.freedesktop.portal.Flatpak.xml b/data/org.freedesktop.portal.Flatpak.xml +index c3afdc2c..b7bbed29 100644 +--- a/data/org.freedesktop.portal.Flatpak.xml ++++ b/data/org.freedesktop.portal.Flatpak.xml +@@ -67,13 +67,13 @@ + + 4 + +- Spawn in a sandbox (equivalent of the -‍-sandbox option of flatpak run). ++ Spawn in a sandbox (equivalent of the sandbox option of flatpak run). + + + + 8 + +- Spawn without network (equivalent of the -‍-unshare=network option of flatpak run). ++ Spawn without network (equivalent of the unshare=network option of flatpak run). + + + diff --git a/flatpak.spec b/flatpak.spec index 9b6ba5a..1925d0d 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -3,12 +3,14 @@ Name: flatpak Version: 1.0.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: Application deployment framework for desktop apps License: LGPLv2+ URL: http://flatpak.org/ Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz +# https://github.com/flatpak/flatpak/pull/1988 +Patch0: flatpak-1.0.0-fix-docs-for-gdbus-codegen.patch BuildRequires: pkgconfig(appstream-glib) BuildRequires: pkgconfig(gio-unix-2.0) @@ -148,6 +150,9 @@ flatpak remote-list --system &> /dev/null || : %changelog +* Mon Aug 20 2018 David King - 1.0.0-2 +- Fix double dash in XML documentation + * Mon Aug 20 2018 David King - 1.0.0-1 - Update to 1.0.0