diff --git a/hardware/virtualization/flatpak/actions.py b/hardware/virtualization/flatpak/actions.py
index 6045087cb1..9fd00f8b60 100644
--- a/hardware/virtualization/flatpak/actions.py
+++ b/hardware/virtualization/flatpak/actions.py
@@ -12,14 +12,11 @@ from pisi.actionsapi import get
def setup():
- shelltools.system("NOCONFIGURE=1 ./autogen.sh")
-
- autotools.configure("--with-priv-mode=setuid \
- --enable-xauth \
- --with-system-bubblewrap \
- --enable-docbook-docs \
- --disable-static \
- --enable-sandboxed-triggers")
+ autotools.configure("--with-priv-mode=setuid \
+ --enable-xauth \
+ --with-system-bubblewrap \
+ --disable-static \
+ --enable-sandboxed-triggers")
pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
diff --git a/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch b/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch
deleted file mode 100644
index 77454ba7b7..0000000000
--- a/hardware/virtualization/flatpak/files/flatpak-1.0.0-glib_fix.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-diff --git a/common/flatpak-utils.c b/common/flatpak-utils.c
-index db4f3645..ac375694 100644
---- a/common/flatpak-utils.c
-+++ b/common/flatpak-utils.c
-@@ -5725,7 +5725,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar *str,
- if (str[0] == '\0')
- {
- g_set_error_literal (error,
-- G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID,
-+ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
- _("Empty string is not a number"));
- return FALSE;
- }
-@@ -5751,7 +5751,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar *str,
- *end_ptr != '\0')
- {
- g_set_error (error,
-- G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_INVALID,
-+ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
- _("“%s” is not an unsigned number"), str);
- return FALSE;
- }
-@@ -5761,7 +5761,7 @@ flatpak_utils_ascii_string_to_unsigned (const gchar *str,
- gchar *max_str = g_strdup_printf ("%" G_GUINT64_FORMAT, max);
-
- g_set_error (error,
-- G_NUMBER_PARSER_ERROR, G_NUMBER_PARSER_ERROR_OUT_OF_BOUNDS,
-+ G_IO_ERROR, G_IO_ERROR_INVALID_ARGUMENT,
- _("Number “%s” is out of bounds [%s, %s]"),
- str, min_str, max_str);
- g_free (min_str);
-
diff --git a/hardware/virtualization/flatpak/pspec.xml b/hardware/virtualization/flatpak/pspec.xml
index 03ec719956..52a547b19a 100644
--- a/hardware/virtualization/flatpak/pspec.xml
+++ b/hardware/virtualization/flatpak/pspec.xml
@@ -11,7 +11,7 @@
LGPLv2
Application distribution framework
Linux application sandboxing and distribution framework, formerly xdg-app
- https://github.com/flatpak/flatpak/archive/1.0.0.tar.gz
+ https://github.com/flatpak/flatpak/releases/download/1.0.4/flatpak-1.0.4.tar.xz
util-linux
gtk-doc
@@ -22,11 +22,13 @@
dbus-devel
json-glib-devel
appstream-glib-devel
+ docbook-xsl
+ python-six
ostree-devel
- bubblewrap_libglnx_submodule.patch
- flatpak-1.0.0-glib_fix.patch
+
+
@@ -61,7 +63,9 @@
/usr/share/man
/usr/share/locale
/usr/share/doc
+ /usr/share/gtk-doc
/usr/share/gdm
+ /usr/share/zsh
flatpak-bindir.sh
@@ -94,6 +98,13 @@
+
+ 2018-10-13
+ 1.0.4
+ Version bump.
+ Ertuğrul Erata
+ ertugrulerata@gmail.com
+
2018-08-23
1.0.0