[packages/flatpak] - updated to 1.5.0 - removed obsolete x32 patch - flatpak-builder moved to separate package

Sun Nov 24 21:21:01 CET 2019

commit 7cdd4d0881e10e2af337905072bd3ce0a4df539d
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Nov 24 21:21:23 2019 +0100

    - updated to 1.5.0
    - removed obsolete x32 patch
    - flatpak-builder moved to separate package

 flatpak.spec | 86 ++++++++++++++++++++++++++++++++++++++----------------------
 x32.patch    | 14 ----------
 2 files changed, 55 insertions(+), 45 deletions(-)
---

diff --git a/flatpak.spec b/flatpak.spec
index 3bea8c4..e1498ca 100644
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -6,40 +6,49 @@
 Summary:	Application deployment framework for desktop apps
 Summary(pl.UTF-8):	Szkielet do wdrażania aplikacji desktopowych
 Name:		flatpak
-Version:	0.9.7
+Version:	1.5.0
 Release:	1
 License:	LGPL v2+
 Group:		Applications
 #Source0Download: https://github.com/flatpak/flatpak/releases/
 Source0:	https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
-# Source0-md5:	f0aafe2c72575ae2619f0867724c9659
-Patch0:		x32.patch
-URL:		http://flatpak.org/
-%{?with_system_bwrap:BuildRequires:	bubblewrap >= 0.1.8}
+# Source0-md5:	cb0c851e44c453c9a0f1229002e10cf0
+URL:		https://flatpak.org/
+BuildRequires:	appstream-glib-devel >= 0.5.10
+%{?with_system_bwrap:BuildRequires:	bubblewrap >= 0.2.1}
+BuildRequires:	dconf-devel >= 0.26
 BuildRequires:	docbook-dtd412-xml
 BuildRequires:	docbook-style-xsl
 # or libelf >= 0.8.12
 BuildRequires:	elfutils-devel
+BuildRequires:	gdk-pixbuf2-devel >= 2.0
 BuildRequires:	gettext-tools >= 0.18.2
-BuildRequires:	glib2-devel >= 1:2.45.8
+BuildRequires:	glib2-devel >= 1:2.60
 BuildRequires:	gobject-introspection-devel >= 1.40.0
+BuildRequires:	gpgme-devel >= 1:1.1.8
 BuildRequires:	gtk-doc >= 1.20
 BuildRequires:	intltool >= 0.35.0
 BuildRequires:	json-glib-devel >= 1.0
 BuildRequires:	libarchive-devel >= 2.8.0
-BuildRequires:	libfuse-devel
+BuildRequires:	libfuse-devel >= 2.9.2
 BuildRequires:	libseccomp-devel
 BuildRequires:	libsoup-devel >= 2.4
+BuildRequires:	libxml2-devel >= 2.4
 BuildRequires:	libxslt-progs
-BuildRequires:	ostree-devel >= 2017.7
+BuildRequires:	ostree-devel >= 2018.9
 BuildRequires:	pkgconfig >= 1:0.24
 BuildRequires:	polkit-devel >= 0.98
 BuildRequires:	rpmbuild(macros) >= 1.682
+BuildRequires:	systemd-devel
 BuildRequires:	tar >= 1:1.22
+BuildRequires:	xdg-dbus-proxy >= 0.1.0
 BuildRequires:	xorg-lib-libXau-devel
 BuildRequires:	xz
-%{?with_system_bwrap:Requires:	bubblewrap >= 0.1.8}
-Requires:	ostree >= 2017.7
+Requires:	appstream-glib >= 0.5.10
+%{?with_system_bwrap:Requires:	bubblewrap >= 0.2.1}
+Requires:	ostree >= 2018.9
+Requires:	polkit >= 0.98
+Requires:	xdg-dbus-proxy >= 0.1.0
 Obsoletes:	xdg-app < 0.6.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -53,8 +62,11 @@ Szkielet do wdrażania aplikacji desktopowych.
 Summary:	Shared flatpak library
 Summary(pl.UTF-8):	Biblioteka współdzielona flatpak
 Group:		Libraries
-Requires:	glib2 >= 1:2.45.8
-Requires:	ostree >= 2017.7
+Requires:	dconf >= 0.26
+Requires:	glib2 >= 1:2.60
+Requires:	gpgme >= 1:1.1.8
+Requires:	libxml2 >= 2.4
+Requires:	ostree >= 2018.9
 
 %description libs
 Shared flatpak library.
@@ -67,8 +79,8 @@ Summary:	Header files for flatpak library
 Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki flatpak
 Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
-Requires:	glib2-devel >= 1:2.45.8
-Requires:	ostree-devel >= 2017.7
+Requires:	glib2-devel >= 1:2.60
+Requires:	ostree-devel >= 2018.9
 
 %description devel
 Header files for flatpak library.
@@ -116,9 +128,21 @@ Bash completion for flatpak command.
 %description -n bash-completion-flatpak -l pl.UTF-8
 Bashowe uzupełnianie parametrów polecenia flatpak.
 
+%package -n zsh-completion-flatpak
+Summary:	ZSH completion for flatpak command
+Summary(pl.UTF-8):	Uzupełnianie parametrów polecenia flatpak w powłoce ZSH
+Group:		Applications/Shells
+Requires:	%{name} = %{version}-%{release}
+Requires:	zsh
+
+%description -n zsh-completion-flatpak
+ZSH completion for flatpak command.
+
+%description -n zsh-completion-flatpak -l pl.UTF-8
+Uzupełnianie parametrów polecenia flatpak w powłoce ZSH.
+
 %prep
 %setup -q
-%patch0 -p1
 
 %build
 %configure \
@@ -126,6 +150,7 @@ Bashowe uzupełnianie parametrów polecenia flatpak.
 	%{?with_static_libs:--enable-static} \
 	--with-html-dir=%{_gtkdocdir} \
 	%{?with_system_bwrap:--with-system-bubblewrap} \
+	--with-system-dbus-proxy \
 	--with-systemdsystemunitdir=%{systemdunitdir}
 %{__make}
 
@@ -152,29 +177,26 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_docdir}/flatpak
 %attr(755,root,root) %{_bindir}/flatpak
 %attr(755,root,root) %{_bindir}/flatpak-bisect
-%attr(755,root,root) %{_bindir}/flatpak-builder
+%attr(755,root,root) %{_bindir}/flatpak-coredumpctl
 %if %{without system_bwrap}
-%attr(755,root,root) %{_libdir}/flatpak-bwrap
+%attr(755,root,root) %{_libexecdir}/flatpak-bwrap
 %endif
-%attr(755,root,root) %{_libdir}/flatpak-dbus-proxy
-%attr(755,root,root) %{_libdir}/flatpak-session-helper
-%attr(755,root,root) %{_libdir}/flatpak-system-helper
-%attr(755,root,root) %{_libdir}/xdg-document-portal
-%attr(755,root,root) %{_libdir}/xdg-permission-store
+%attr(755,root,root) %{_libexecdir}/flatpak-portal
+%attr(755,root,root) %{_libexecdir}/flatpak-session-helper
+%attr(755,root,root) %{_libexecdir}/flatpak-system-helper
+%attr(755,root,root) %{_libexecdir}/flatpak-validate-icon
+%attr(755,root,root) %{_libexecdir}/revokefs-fuse
 %attr(755,root,root) /etc/profile.d/flatpak.sh
 /etc/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
 %{_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
+%{_datadir}/dbus-1/services/org.freedesktop.portal.Flatpak.service
 %{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
 %{_datadir}/polkit-1/rules.d/org.freedesktop.Flatpak.rules
 %{systemdunitdir}/flatpak-system-helper.service
-# dir not available in PLD (yet?)
-#%{systemduserunitdir}/dbus.service.d/flatpak.conf
+%{systemduserunitdir}/flatpak-portal.service
 %{systemduserunitdir}/flatpak-session-helper.service
-%{systemduserunitdir}/xdg-document-portal.service
-%{systemduserunitdir}/xdg-permission-store.service
+%attr(755,root,root) /usr/lib/systemd/user-environment-generators/60-flatpak
 # not supported by PLD gdm (yet?)
 #%{_datadir}/gdm/env.d/flatpak.env
 %dir %{_datadir}/flatpak
@@ -184,7 +206,6 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man5/flatpak-flatpakref.5*
 %{_mandir}/man5/flatpak-flatpakrepo.5*
 %{_mandir}/man5/flatpak-installation.5*
-%{_mandir}/man5/flatpak-manifest.5*
 %{_mandir}/man5/flatpak-metadata.5*
 %{_mandir}/man5/flatpak-remote.5*
 
@@ -194,8 +215,7 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %ghost %{_libdir}/libflatpak.so.0
 %{_libdir}/girepository-1.0/Flatpak-1.0.typelib
 %{_datadir}/dbus-1/interfaces/org.freedesktop.Flatpak.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.impl.portal.PermissionStore.xml
-%{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Documents.xml
+%{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml
 
 %files devel
 %defattr(644,root,root,755)
@@ -217,3 +237,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n bash-completion-flatpak
 %defattr(644,root,root,755)
 %{bash_compdir}/flatpak
+
+%files -n zsh-completion-flatpak
+%defattr(644,root,root,755)
+%{zsh_compdir}/_flatpak
diff --git a/x32.patch b/x32.patch
deleted file mode 100644
index b4cb7af..0000000
--- a/x32.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- flatpak-0.9.4/common/flatpak-oci-registry.c~	2017-05-22 09:02:48.000000000 +0200
-+++ flatpak-0.9.4/common/flatpak-oci-registry.c	2017-06-05 10:46:01.316092892 +0200
-@@ -264,7 +264,11 @@
-   if (fd == -1)
-     return NULL;
- 
-+#ifdef __ILP32__
-+  current_etag = g_strdup_printf ("%llu", st_buf.st_mtime);
-+#else
-   current_etag = g_strdup_printf ("%lu", st_buf.st_mtime);
-+#endif
- 
-   if (etag != NULL && strcmp (current_etag, etag) == 0)
-     {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/flatpak.git/commitdiff/7cdd4d0881e10e2af337905072bd3ce0a4df539d

