diff --git a/flatpak-1.15.4.tar.xz b/flatpak-1.15.4.tar.xz
deleted file mode 100644
index ac9f66d3a311f014015b7cfb7cd29fb7b0ea85d6..0000000000000000000000000000000000000000
Binary files a/flatpak-1.15.4.tar.xz and /dev/null differ
diff --git a/flatpak-1.15.8.tar.xz b/flatpak-1.15.8.tar.xz
new file mode 100644
index 0000000000000000000000000000000000000000..cf0c399d20a483004b057f2b495c0318e6a77a2e
Binary files /dev/null and b/flatpak-1.15.8.tar.xz differ
diff --git a/flatpak.spec b/flatpak.spec
index c00f77b4d72d2bba4a39f63e15207e26dc295e34..7abc0486ba7cd981a9ba162a6e23d949cba92a5e 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -1,13 +1,16 @@
 %define anolis_release 1
 
 %global appstream_version 0.15.3
-%global bubblewrap_version 0.5.0
+%global bubblewrap_version 0.8.0
 %global glib_version 2.46.0
+%global gpgme_version 1.8.0
 %global libcurl_version 7.29.0
 %global ostree_version 2020.8
+%global wayland_protocols_version 1.32
+%global wayland_scanner_version 1.15
 
 Name:           flatpak
-Version:        1.15.4
+Version:        1.15.8
 Release:        %{anolis_release}%{?dist}
 Summary:        Application deployment framework for desktop apps
 
@@ -25,6 +28,7 @@ BuildRequires:  pkgconfig(fuse3)
 BuildRequires:  pkgconfig(gdk-pixbuf-2.0)
 BuildRequires:  pkgconfig(gio-unix-2.0) >= %{glib_version}
 BuildRequires:  pkgconfig(gobject-introspection-1.0) >= 1.40.0
+BuildRequires:  pkgconfig(gpgme) >= %{gpgme_version}
 BuildRequires:  pkgconfig(json-glib-1.0)
 BuildRequires:  pkgconfig(libarchive) >= 2.8.0
 BuildRequires:  pkgconfig(libseccomp)
@@ -35,19 +39,22 @@ BuildRequires:  pkgconfig(libzstd) >= 0.8.1
 BuildRequires:  pkgconfig(malcontent-0)
 BuildRequires:  pkgconfig(ostree-1) >= %{ostree_version}
 BuildRequires:  pkgconfig(polkit-gobject-1)
+BuildRequires:  pkgconfig(wayland-client)
+BuildRequires:  pkgconfig(wayland-protocols) >= %{wayland_protocols_version}
+BuildRequires:  pkgconfig(wayland-scanner) >= %{wayland_scanner_version}
 BuildRequires:  pkgconfig(xau)
 BuildRequires:  bison
 BuildRequires:  bubblewrap >= %{bubblewrap_version}
 BuildRequires:  docbook-dtds
 BuildRequires:  docbook-style-xsl
 BuildRequires:  gettext-devel
-BuildRequires:  gpgme-devel
 BuildRequires:  gtk-doc
 BuildRequires:  libcap-devel
 BuildRequires:  meson
 BuildRequires:  python3-pyparsing
 BuildRequires:  systemd
 BuildRequires:  systemd-rpm-macros
+BuildRequires:  /usr/bin/fusermount3
 BuildRequires:  /usr/bin/pkcheck
 BuildRequires:  /usr/bin/socat
 BuildRequires:  /usr/bin/xdg-dbus-proxy
@@ -62,7 +69,7 @@ Requires:       glib2 >= %{glib_version}
 Requires:       libcurl >= %{libcurl_version}
 Requires:       librsvg2
 Requires:       ostree-libs >= %{ostree_version}
-Requires:       /usr/bin/fusermount
+Requires:       /usr/bin/fusermount3
 Requires:       /usr/bin/xdg-dbus-proxy
 Requires:       (flatpak-selinux = %{?epoch:%{epoch}:}%{version}-%{release} if selinux-policy-targeted)
 Requires:       %{name}-session-helper = %{?epoch:%{epoch}:}%{version}-%{release}
@@ -86,7 +93,7 @@ This package contains the pkg-config file and development headers for %{name}.
 %package libs
 Summary:        Libraries for %{name}
 Requires:       bubblewrap >= %{bubblewrap_version}
-Requires:       ostree >= %{ostree_version}
+Requires:       ostree-libs >= %{ostree_version}
 
 %description libs
 This package contains libflatpak.
@@ -135,22 +142,19 @@ The %{name}-doc package contains documentation files for %{name}.
 
 
 %build
-(if ! test -x configure; then NOCONFIGURE=1 ./autogen.sh; CONFIGFLAGS=--enable-gtk-doc; fi;
-autoreconf
- export XMLTO_FLAGS="--stringparam generate.consistent.ids=1"
- %configure \
-            --enable-docbook-docs \
-            --enable-installed-tests \
-            --enable-selinux-module \
-            --with-priv-mode=none \
-            --with-system-bubblewrap \
-            --with-system-dbus-proxy \
-            $CONFIGFLAGS)
-%make_build
+%meson \
+    -Dinstalled_tests=true \
+    -Dsystem_bubblewrap=/usr/bin/bwrap \
+    -Dsystem_dbus_proxy=/usr/bin/xdg-dbus-proxy \
+    -Dtmpfilesdir=%{_tmpfilesdir} \
+    -Dmalcontent=enabled \
+    -Dwayland_security_context=enabled \
+    %{nil}
+%meson_build
 
 
 %install
-%make_install
+%meson_install
 install -pm 644 NEWS README.md %{buildroot}/%{_pkgdocdir}
 # The system repo is not installed by the flatpak build system.
 install -d %{buildroot}%{_localstatedir}/lib/flatpak
@@ -158,8 +162,6 @@ install -d %{buildroot}%{_sysconfdir}/flatpak/remotes.d
 
 %find_lang %{name}
 
-%generate_compatibility_deps
-
 %pre
 %sysusers_create_compat %{SOURCE1}
 
@@ -182,8 +184,6 @@ fi
 %{_bindir}/flatpak
 %{_bindir}/flatpak-bisect
 %{_bindir}/flatpak-coredumpctl
-%{abidir}/flatpak-option.list
-%{abidir}/flatpak-coredumpctl-option.list
 %{_datadir}/bash-completion
 %{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.Authenticator.xml
@@ -207,6 +207,8 @@ fi
 %{_mandir}/man5/flatpak-flatpakrepo.5*
 %{_mandir}/man5/flatpak-installation.5*
 %{_mandir}/man5/flatpak-remote.5*
+%{_mandir}/man5/flatpakref.5*
+%{_mandir}/man5/flatpakrepo.5*
 %{_sysconfdir}/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
 %dir %{_sysconfdir}/flatpak
 %{_sysconfdir}/flatpak/remotes.d
@@ -217,6 +219,7 @@ fi
 %{_userunitdir}/flatpak-portal.service
 %{_systemd_system_env_generator_dir}/60-flatpak-system-only
 %{_systemd_user_env_generator_dir}/60-flatpak
+%{_tmpfilesdir}/%{name}.conf
 
 %files devel
 %{_datadir}/gir-1.0/Flatpak-1.0.gir
@@ -227,10 +230,8 @@ fi
 
 %files libs
 %license COPYING
-%dir %{abidir}
 %{_libdir}/girepository-1.0/Flatpak-1.0.typelib
 %{_libdir}/libflatpak.so.*
-%{abidir}/libflatpak.dump
 
 %files selinux
 %{_datadir}/selinux/packages/flatpak.pp.bz2
@@ -248,9 +249,12 @@ fi
 %{_libexecdir}/installed-tests
 
 %files doc
-%doc README.md NEWS INSTALL
+%doc README.md NEWS
 
 %changelog
+* Fri May 10 2024 mgb01105731 <mgb01105731@alibaba-inc.com> - 1.15.8-1
+- update to 1.15.8
+
 * Tue Jun 13 2023 mgb01105731 <mgb01105731@alibaba-inc.com> - 1.15.4-1
 - New version 1.15.4
 - Fix CVE-2023-28100