Accepting request 583071 from GNOME:Factory

- Modernize spec-file by calling spec-cleaner (forwarded request 583055 from dimstar)

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

flatpak.changes

@@ -1,3 +1,17 @@
+-------------------------------------------------------------------
+Mon Mar  5 14:55:20 UTC 2018 - fcrozat@suse.com
+
+- Do not build document portal anymore, rely on
+  xdg-desktop-portal/-gtk instead. Add corresponding dependency.
+- Build with --with-system-bubblewrap and Add corresponding 
+  build and runtime dependency.
+- Remove --with-dwarf-header configure flag, it no longer exists.
+
+-------------------------------------------------------------------
+Wed Feb 28 16:25:27 UTC 2018 - dimstar@opensuse.org
+
+- Modernize spec-file by calling spec-cleaner
+
 -------------------------------------------------------------------
 Wed Feb 14 23:23:20 UTC 2018 - dimstar@opensuse.org
 

flatpak.spec

@@ -21,10 +21,11 @@ Name:           flatpak
 Version:        0.10.4
 Release:        0
 Summary:        OSTree based application bundles management
-License:        LGPL-2.1+
+License:        LGPL-2.1-or-later
 Group:          System/Packages
-Url:            https://flatpak.github.io/
+URL:            https://flatpak.github.io/
 Source:         %{name}-%{version}.tar.xz
+BuildRequires:  bubblewrap >= 0.1.8
 BuildRequires:  docbook-xsl-stylesheets
 BuildRequires:  gtk-doc
 BuildRequires:  intltool >= 0.35.0
@@ -49,7 +50,9 @@ BuildRequires:  pkgconfig(libsoup-2.4)
 BuildRequires:  pkgconfig(ostree-1) >= 2017.14
 BuildRequires:  pkgconfig(polkit-gobject-1)
 BuildRequires:  pkgconfig(xau)
+Requires:       bubblewrap >= 0.1.8
 Requires:       ostree >= 2017.14
+Requires:       xdg-desktop-portal >= 0.10
 Recommends:     %{name}-lang = %{version}
 # Remove after openSUSE Leap 42 is out of scope
 Provides:       xdg-app = %{version}
@@ -100,8 +103,9 @@ more information.
 NOCONFIGURE=1 ./autogen.sh
 %configure \
     --disable-silent-rules \
-    --with-dwarf-header=%{_includedir}/libdwarf \
     --enable-gtk-doc \
+    --disable-document-portal \
+    --with-system-bubblewrap \
     --with-priv-mode=none
 make %{?_smp_mflags}
 
@@ -132,26 +136,19 @@ flatpak remote-list --system > /dev/null 2>&1
 %service_del_postun flatpak-system-helper.service
 
 %files -f %{name}.lang
-%doc COPYING
+%license COPYING
 %{_bindir}/flatpak
 %{_bindir}/flatpak-bisect
-%{_libexecdir}/flatpak-bwrap
 %{_libexecdir}/flatpak-dbus-proxy
 %{_libexecdir}/flatpak-session-helper
 %{_libexecdir}/flatpak-system-helper
-%{_libexecdir}/xdg-document-portal
-%{_libexecdir}/xdg-permission-store
 %{_datadir}/bash-completion/completions/flatpak
 # # Own dirs so we don't have to depend on dbus for building.
 %dir %{_datadir}/dbus-1
 %dir %{_datadir}/dbus-1/interfaces
 %dir %{_datadir}/dbus-1/services
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Documents.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.impl.portal.PermissionStore.xml
 %{_datadir}/dbus-1/services/org.freedesktop.Flatpak.service
-%{_datadir}/dbus-1/services/org.freedesktop.impl.portal.PermissionStore.service
-%{_datadir}/dbus-1/services/org.freedesktop.portal.Documents.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.Flatpak.SystemHelper.service
 # policykit rules
 %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
@@ -172,8 +169,6 @@ flatpak remote-list --system > /dev/null 2>&1
 %{_unitdir}/flatpak-system-helper.service
 %{_sbindir}/rcflatpak-system-helper
 %{_userunitdir}/flatpak-session-helper.service
-%{_userunitdir}/xdg-document-portal.service
-%{_userunitdir}/xdg-permission-store.service
 %dir %{_localstatedir}/lib/flatpak
 %dir %{_userunitdir}
 %dir %{_userunitdir}/dbus.service.d