diff --git a/_service b/_service
new file mode 100644
index 0000000..b9e1b0b
--- /dev/null
+++ b/_service
@@ -0,0 +1,14 @@
+
+
+ https://github.com/flatpak/flatpak.git
+ git
+ 0.6.9
+ enable
+ refs/tags/0.6.9
+
+
+ *.tar
+ xz
+
+
+
diff --git a/_servicedata b/_servicedata
new file mode 100644
index 0000000..979e54d
--- /dev/null
+++ b/_servicedata
@@ -0,0 +1,4 @@
+
+
+ https://github.com/flatpak/flatpak.git
+ fcd91ad6db34114bb9da4a120f3d059085e06e3c
\ No newline at end of file
diff --git a/flatpak-0.6.4.tar.xz b/flatpak-0.6.4.tar.xz
deleted file mode 100644
index 10f498e..0000000
--- a/flatpak-0.6.4.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:19ffcff550e71dfd810df2d465fbde1b5539ce0cb83a4ed6de1558c3e91fb275
-size 558052
diff --git a/flatpak-0.6.9.tar.xz b/flatpak-0.6.9.tar.xz
new file mode 100644
index 0000000..8e1ba9a
--- /dev/null
+++ b/flatpak-0.6.9.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:a1937a471103504beb95b9bcf1a638de64a79efb987425dadcdb9a0e9db6e9b3
+size 450628
diff --git a/flatpak-rpmlintrc b/flatpak-rpmlintrc
new file mode 100644
index 0000000..3a4d164
--- /dev/null
+++ b/flatpak-rpmlintrc
@@ -0,0 +1,4 @@
+# needed until bsc#984817 is resolved
+setBadness("suse-dbus-unauthorized-service", 0)
+setBadness("polkit-untracked-privilege", 0)
+setBadness("polkit-unauthorized-privilege",0)
diff --git a/flatpak.changes b/flatpak.changes
index b94da6a..3c52eca 100644
--- a/flatpak.changes
+++ b/flatpak.changes
@@ -1,10 +1,140 @@
+-------------------------------------------------------------------
+Tue Sep 06 15:34:26 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 0.6.9:
+ + Dropped dependency on libgsystem.
+ + Allow passing partial refs whenever a CLI command takes an app
+ or runtime name.
+ + New command build-commit-from creates a new commit based on the
+ contents of another commit (optionally from another local
+ repo).
+ + The sandbox now contains $XDG_RUNTIME_DIR/app/$APPID from the
+ host (and the directory is created if needed).
+ + update: Better output, and faster for the no updates case.
+ + build-export: Don't make most validation errors fail, instead
+ just print a warning.
+ + builder:
+ - Support local path references for git sources.
+ - Better handling of recursive git submodules.
+ - Fixed issues with the .pyc mtime rewriting.
+ - Handle symbolic icons for rename-icon.
+ - Add --stop-at=$module to do partial builds.
+ - Add --sandbox flag to disable the build from escaping from
+ the sandbox via build-args.
+ + Updated translations.
+- Drop pkgconfig(libgsystem) BuildRequires following upstream.
+
+-------------------------------------------------------------------
+Tue Aug 16 09:39:38 UTC 2016 - dmacvicar@suse.de
+
+- Update to version 0.6.8:
+ + Requires OSTree 2016.7, allowing to enable use of static delta
+ for system downloads again.
+ + Support --no-desktop which allows you to run a flatpak app
+ outside a desktop, with some loss of functionallity
+ (for example, there will be no systemd --user scope created for
+ the app)..
+ + More documentation.
+ + Memory leak fixes.
+ + Initial support for rpms as flatpak-builder archive sources.
+ + Start work on translating the CLI.
+ + Install systemd config snippet to set the right XDG_DATA_DIRS
+ path.
+ + Support --arch in flatpak list.
+ + Support access() in the document portal.
+ + Validate exported desktop files.
+
+-------------------------------------------------------------------
+Tue Jul 19 17:58:13 UTC 2016 - dimstar@opensuse.org
+
+- Change /usr/bin/tar Requires to /bin/tar: this has never been
+ moved to /usr/bin.
+
+-------------------------------------------------------------------
+Sat Jul 02 11:51:25 UTC 2016 - zaitor@opensuse.org
+
+- Update to version 0.6.7:
+ + Expand the flatpak run --devel docs.
+ + Add an option for journal sockets.
+ + Document new socket option.
+ + Fix builddir option type in flatpak-builder documentation.
+ + document portal: don't reply to GetMountPoint() until ready.
+ + Downgrade failure to get document portal from warning to
+ message.
+ + tests: don't treat helper scripts as though they were tests.
+ + Run tests with a private XDG_RUNTIME_DIR.
+ + Add BWRAP and --with-system-bubblewrap configure arguments.
+ + test-basic: do not fail in non-English locales.
+ + Update to latest libglnx with lock release fix.
+ + fix warning.
+ + Fix leak in flatpak-installed-ref.
+ + utils: Add flatpak_spawnv() helper.
+ + builder: Add "use-git" option for patch source type.
+ + Make journal always available in the sandbox.
+ + builder: Report errors to stderr, not stdout.
+ + tests: Add test for "use-git" patch application.
+ + tests/test-builder.sh: Re-silence flatpak-builder.
+ + tests: Test install/updates with static deltas.
+ + extensions: Minor cleanup.
+ + Add tests for extensions.
+ + extensions: Always create a tmpfs for subdirectory extensions.
+ + common: Remove unused functions.
+ + utils: Add flatpak_get_current_locale_subpaths().
+ + utils: Add flatpak_summary_match_subrefs.
+ + builder: Strip "." from locale names too.
+ + FlatpakDir: Add flatpak_dir_find_remote/local_related.
+ + Add flatpak_dir_install_or_update.
+ + Install/update/uninstall related refs.
+ + builder: Set the new extension properties.
+ + Bump version number since last release.
+ + Document the metadata format.
+ + lib: Support listing related refs.
+ + Add some code I used to test the new related refs code.
+ + doc/flatpak-metadata: Add some extra clarifications.
+ + Update NEWS.
+ + Require ostree 2016.6.
+ + builder: Clear mtime to 1, not 0, to match what new ostree
+ does.
+ + Remove unused variables.
+
+-------------------------------------------------------------------
+Tue Jun 28 08:33:41 UTC 2016 - fcrozat@suse.com
+
+- Update to version 0.6.6:
+ + lib: Add flatpak_get_supported_arches.
+ + Add flatpak --supported-arches.
+ + common: Make some internal functions static.
+ + update: Always look at all existing apps when updating.
+ + Disable static deltas for system-helper updates.
+ + Make finding refs handle multi-arch.
+ + make-current: Use find_installed_ref().
+ + remote-ls: Better multiarch support.
+- Changes from 0.6.5:
+ + Documentation improvements
+ + builder: Check that the specified command exists after build is
+ done.
+ + builder: Fix up mtime in headers for python precompiled files.
+ + builder: Allow submodules and including modules from other json
+ files.
+ + system-helper builds are optional (--disable-system-helper).
+ + system-helper: Support installing from local remotes and
+ bundles.
+ + Improved support for --subpath installs, including libflatpak
+ support.
+ + Improved command line completion.
+- Create /var/lib/flatpak directory, own it and ensure system wide
+ repo exists when installing / updating flatpak package.
+- Add pkgconfig(libarchive) >= 2.8.0 and gtk-doc to BuildRequires.
+- Replace libelf-devel for pkgconfig(libelf) BuildRequires.
+- Bump ostree minimal requirements to 2016.5.
+
-------------------------------------------------------------------
Wed Jun 8 08:09:11 UTC 2016 - tchvatal@suse.com
- Version update to 0.6.4:
- * Rename to flatpack
- * New homepage and download url
- * Various fixes
+ + Rename to flatpack
+ + New homepage and download url
+ + Various fixes
-------------------------------------------------------------------
Wed Apr 20 11:19:06 UTC 2016 - dimstar@opensuse.org
diff --git a/flatpak.spec b/flatpak.spec
index eaacac9..a07c562 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -15,10 +15,13 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
+%if 0%{suse_version} == 1315
+%define _userunitdir /usr/lib/systemd/user/
+%endif
%define libname libflatpak0
Name: flatpak
-Version: 0.6.4
+Version: 0.6.9
Release: 0
Summary: Manage OSTree based application bundles
License: LGPL-2.1+
@@ -26,10 +29,10 @@ Group: System/Packages
Url: https://flatpak.github.io/
Source: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
BuildRequires: docbook-xsl-stylesheets
+BuildRequires: gtk-doc
BuildRequires: intltool >= 0.35.0
BuildRequires: libcap-devel
BuildRequires: libdwarf-devel
-BuildRequires: libelf-devel >= 0.8.12
BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xsltproc
@@ -40,16 +43,18 @@ BuildRequires: pkgconfig(glib-2.0)
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0
BuildRequires: pkgconfig(gobject-introspection-no-export-1.0) >= 1.40.0
BuildRequires: pkgconfig(json-glib-1.0)
-BuildRequires: pkgconfig(libgsystem) >= 2015.1
+BuildRequires: pkgconfig(libarchive) >= 2.8.0
+BuildRequires: pkgconfig(libelf) >= 0.8.12
BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsoup-2.4)
-BuildRequires: pkgconfig(ostree-1) >= 2015.3
+BuildRequires: pkgconfig(ostree-1) >= 2016.7
BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(xau)
-Requires: ostree >= 2015.3
+Requires: ostree >= 2016.5
# Remove after openSUSE Leap 42 is out of scope
Provides: xdg-app = %{version}
Obsoletes: xdg-app <= 0.5.2-2
+Recommends: %{name}-lang = %{version}
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_requires}
@@ -65,7 +70,7 @@ Requires: %{_bindir}/bzr
Requires: %{_bindir}/git
Requires: %{_bindir}/patch
Requires: %{_bindir}/strip
-Requires: %{_bindir}/tar
+Requires: /bin/tar
Requires: %{_bindir}/unzip
Requires: %{name} = %{version}
@@ -102,13 +107,17 @@ flatpak is a system for building, distributing and running sandboxed desktop
applications on Linux. See https://wiki.gnome.org/Projects/SandboxedApps for
more information.
+%lang_package
+
%prep
%setup -q
%build
+NOCONFIGURE=1 ./autogen.sh
%configure \
--disable-silent-rules \
--with-dwarf-header=%{_includedir}/libdwarf \
+ --enable-gtk-doc \
--with-priv-mode=none
make %{?_smp_mflags}
@@ -118,6 +127,10 @@ find %{buildroot} -type f -name "*.la" -delete -print
mkdir -p %{buildroot}%{_sbindir}
ln -s service %{buildroot}%{_sbindir}/rcflatpak-system-helper
+# The system repo is not installed by the flatpak build system.
+install -d %{buildroot}%{_localstatedir}/lib/flatpak
+%find_lang %{name}
+
%post -n %{libname} -p /sbin/ldconfig
%postun -n %{libname} -p /sbin/ldconfig
@@ -129,11 +142,13 @@ ln -s service %{buildroot}%{_sbindir}/rcflatpak-system-helper
%post
%service_add_post flatpak-system-helper.service
+# Create an (empty) system-wide repo.
+flatpak remote-list --system > /dev/null 2>&1
%postun
%service_del_postun flatpak-system-helper.service
-%files
+%files -f %{name}.lang
%defattr(-,root,root)
%{_bindir}/flatpak
%{_libexecdir}/flatpak-bwrap
@@ -158,6 +173,7 @@ ln -s service %{buildroot}%{_sbindir}/rcflatpak-system-helper
%{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
%{_datadir}/polkit-1/rules.d/org.freedesktop.Flatpak.rules
%{_mandir}/man1/%{name}*.1%{ext_man}
+%{_mandir}/man5/flatpak-metadata.5%{ext_man}
%exclude %{_mandir}/man1/flatpak-builder.1%{ext_man}
%{_datadir}/%{name}/
%{_sysconfdir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
@@ -171,6 +187,10 @@ ln -s service %{buildroot}%{_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
+%{_userunitdir}/dbus.service.d/flatpak.conf
%files builder
%defattr(-,root,root)