diff --git a/_service b/_service
index 19dd220..8eb763d 100644
--- a/_service
+++ b/_service
@@ -4,7 +4,7 @@
git
@PARENT_TAG@
enable
- refs/tags/1.0.6
+ refs/tags/1.2.0
*.tar
diff --git a/_servicedata b/_servicedata
index 5ab358e..0b03d64 100644
--- a/_servicedata
+++ b/_servicedata
@@ -1,4 +1,4 @@
https://github.com/flatpak/flatpak.git
- 38b5560c66a5b28287df964b6a61d928ec163ed2
\ No newline at end of file
+ 7baac10cdbb9096e675377d8adf21a09e2ffd2e8
\ No newline at end of file
diff --git a/flatpak-1.0.6.tar.xz b/flatpak-1.0.6.tar.xz
deleted file mode 100644
index 9331277..0000000
--- a/flatpak-1.0.6.tar.xz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0da41c8a5ee5782188fea4fd0376275dd6eba1c21e3bd59b1fd03cb367d7b4c4
-size 719476
diff --git a/flatpak-1.2.0.tar.xz b/flatpak-1.2.0.tar.xz
new file mode 100644
index 0000000..4c339db
--- /dev/null
+++ b/flatpak-1.2.0.tar.xz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:6291e612f3e8bc10c896a4908d4817d34a43522d39380645a215b3a2f798f39d
+size 795844
diff --git a/flatpak.changes b/flatpak.changes
index 948b41f..6ffd8fe 100644
--- a/flatpak.changes
+++ b/flatpak.changes
@@ -1,23 +1,50 @@
+-------------------------------------------------------------------
+Mon Jan 28 20:58:56 UTC 2019 - bjorn.lie@gmail.com
+
+- Update to version 1.2.0:
+ + Ensure DeployCollectionID works in flatpakrepo files in all
+ cases.
+ + Don't error out with empty installations in uninstall.
+ + Add helper that validates icon files during export.
+ + Don't allow root to modify the (non-root) per-user flatpak
+ installation, as this risks causing problems later.
+ + Remove some incorrect warnings from flatpak repair.
+ + Allow multiple name segments after prefix when exporting files.
+ + Allow specification of ellipsization in --colums options.
+ + Handle dates as well as timestamps in appdata
+ + Fixed a bug where flatpak remote-delete removed too many refs.
+ + Now we use raw terminal mode during a transaction to a avoid
+ problems with input during the operation causing problems with
+ escape sequences.
+ + Generate a fontconfig directory remapping snippet as will be
+ needed for newer versions of fontconfig.
+ + Support --extra-collection-id in build-commit-from to bind the
+ commit to multiple collection ids. This is work in progress in
+ ostree.
+- Add pkgconfig(dconf) BuildRequires: New dependency.
+
-------------------------------------------------------------------
Thu Dec 13 12:54:42 UTC 2018 - alarrosa@suse.com
- Update to version 1.0.6:
- * This release fixes an issue that lets system-wide installed
+ + This release fixes an issue that lets system-wide installed
applications create setuid root files inside their app dir
(somewhere in /var/lib/flatpak/app). Setuid support is disabled
inside flatpaks, so such files are only a risk if the user runs
them manually outside flatpak. Installing a flatpak system-wide
needs root access, so this isn't a privilege elevation for
non-root users.
- * The permissions of the files created by the apply_extra script is
- canonicalized and the script itself is run without any capabilities.
- * Better matching of existing remotes when the local and remote configuration
- differs wrt collection ids.
- * New flatpakrepo DeployCollectionID replaces CollectionID, doing the
- same thing. It is recommended to use this instead because older versions
- of flatpak has bugs in the support of collection ids, and this key
- will only be respected in versions where it works.
- * The X11 socket is now mounted read-only.
+ + The permissions of the files created by the apply_extra script
+ is canonicalized and the script itself is run without any
+ capabilities.
+ + Better matching of existing remotes when the local and remote
+ configuration differs wrt collection ids.
+ + New flatpakrepo DeployCollectionID replaces CollectionID, doing
+ the same thing. It is recommended to use this instead because
+ older versions of flatpak has bugs in the support of collection
+ ids, and this key will only be respected in versions where it
+ works.
+ + The X11 socket is now mounted read-only.
-------------------------------------------------------------------
Thu Dec 13 12:29:18 UTC 2018 - alarrosa@suse.com
diff --git a/flatpak.spec b/flatpak.spec
index 03a2d36..7662030 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -1,7 +1,7 @@
#
# spec file for package flatpak
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
%define libname libflatpak0
Name: flatpak
-Version: 1.0.6
+Version: 1.2.0
Release: 0
Summary: OSTree based application bundles management
License: LGPL-2.1-or-later
@@ -38,6 +38,7 @@ BuildRequires: libtool
BuildRequires: pkgconfig
BuildRequires: xsltproc
BuildRequires: pkgconfig(appstream-glib)
+BuildRequires: pkgconfig(dconf)
BuildRequires: pkgconfig(fuse)
BuildRequires: pkgconfig(gio-2.0)
BuildRequires: pkgconfig(gio-unix-2.0)
@@ -164,6 +165,7 @@ mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules
%{_libexecdir}/flatpak-portal
%{_libexecdir}/flatpak-session-helper
%{_libexecdir}/flatpak-system-helper
+%{_libexecdir}/flatpak-validate-icon
%{_datadir}/bash-completion/completions/flatpak
# # Own dirs so we don't have to depend on dbus for building.
%dir %{_datadir}/dbus-1
@@ -195,9 +197,7 @@ mv %{buildroot}/%{_datadir}/polkit-1/rules.d/{,60-}org.freedesktop.Flatpak.rules
%{_userunitdir}/flatpak-session-helper.service
%{_userunitdir}/flatpak-portal.service
%ghost %dir %{_localstatedir}/lib/flatpak
-%dir %{_userunitdir}
-%dir %{_userunitdir}/dbus.service.d
-%{_userunitdir}/dbus.service.d/flatpak.conf
+%{_libexecdir}/systemd/user-environment-generators/60-flatpak
%files -n %{libname}
%{_libdir}/libflatpak.so.*