From c93f9931f34230a3cb468d3fdd6219e8cc3b911b Mon Sep 17 00:00:00 2001
From: David King <amigadave@amigadave.com>
Date: Jul 21 2016 12:46:42 +0000
Subject: Use system bubblewrap


---

diff --git a/flatpak.spec b/flatpak.spec
index 89f040d..7e4542b 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -1,6 +1,6 @@
 Name:           flatpak
 Version:        0.6.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Application deployment framework for desktop apps
 
 Group:          Development/Tools
@@ -26,6 +26,7 @@ BuildRequires:  libattr-devel
 BuildRequires:  libcap-devel
 BuildRequires:  libdwarf-devel
 BuildRequires:  systemd
+BuildRequires:  /usr/bin/bwrap
 BuildRequires:  /usr/bin/xsltproc
 
 # Crashes with older kernels (the bug being introduced in 4.0.2), without the
@@ -35,6 +36,8 @@ Requires:       kernel >= 4.0.4-202
 # Needed for the document portal.
 Requires:       /usr/bin/fusermount
 
+Requires:       /usr/bin/bwrap
+
 # Remove in F27.
 Provides:       xdg-app = %{version}-%{release}
 Obsoletes:      xdg-app <= 0.5.2-2
@@ -80,6 +83,7 @@ This package contains the pkg-config file and development headers for %{name}.
 Summary:        Libraries for %{name}
 Group:          Development/Libraries
 License:        LGPLv2+
+Requires:       /usr/bin/bwrap
 # Remove in F27.
 Provides:       xdg-app-libs%{?_isa} = %{version}-%{release}
 Obsoletes:      xdg-app-libs <= 0.5.2-2
@@ -94,7 +98,8 @@ This package contains libflatpak.
 
 %build
 # User namespace support is sufficient.
-%configure --with-dwarf-header=%{_includedir}/libdwarf --with-priv-mode=none
+%configure --with-dwarf-header=%{_includedir}/libdwarf --with-priv-mode=none \
+           --with-system-bubblewrap
 %make_build V=1
 
 
@@ -132,7 +137,6 @@ flatpak remote-list --system
 %{_datadir}/%{name}
 %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
 %{_datadir}/polkit-1/rules.d/org.freedesktop.Flatpak.rules
-%{_libexecdir}/flatpak-bwrap
 %{_libexecdir}/flatpak-dbus-proxy
 %{_libexecdir}/flatpak-session-helper
 %{_libexecdir}/flatpak-system-helper
@@ -167,6 +171,9 @@ flatpak remote-list --system
 
 
 %changelog
+* Thu Jul 21 2016 David King <amigadave@amigadave.com> - 0.6.7-2
+- Use system bubblewrap
+
 * Fri Jul 01 2016 David King <amigadave@amigadave.com> - 0.6.7-1
 - Update to 0.6.7