- updated to 1.7.2

diff --git a/flatpak.spec b/flatpak.spec
index e1498caa5bfa480b501a21db4b2d136b9f535ec5..53c5991ef4c8942cda469beab02e2f2ced49f0d7 100644 (file)
--- a/flatpak.spec
+++ b/flatpak.spec
@@ -2,23 +2,24 @@
 # Conditional build:
 %bcond_without static_libs     # static library
 %bcond_without system_bwrap    # system bubblewrap
+%bcond_without malcontent      # parental control support via libmalcontent
 
 Summary:       Application deployment framework for desktop apps
 Summary(pl.UTF-8):     Szkielet do wdrażania aplikacji desktopowych
 Name:          flatpak
-Version:       1.5.0
+Version:       1.7.2
 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: cb0c851e44c453c9a0f1229002e10cf0
+# Source0-md5: f8737742681e9a4c16d8baec4291244e
 URL:           https://flatpak.org/
 BuildRequires: appstream-glib-devel >= 0.5.10
-%{?with_system_bwrap:BuildRequires:    bubblewrap >= 0.2.1}
+%{?with_system_bwrap:BuildRequires:    bubblewrap >= 0.4.0}
 BuildRequires: dconf-devel >= 0.26
 BuildRequires: docbook-dtd412-xml
-BuildRequires: docbook-style-xsl
+BuildRequires: docbook-style-xsl-nons
 # or libelf >= 0.8.12
 BuildRequires: elfutils-devel
 BuildRequires: gdk-pixbuf2-devel >= 2.0
@@ -30,7 +31,9 @@ BuildRequires:        gtk-doc >= 1.20
 BuildRequires: intltool >= 0.35.0
 BuildRequires: json-glib-devel >= 1.0
 BuildRequires: libarchive-devel >= 2.8.0
+BuildRequires: libcap-devel
 BuildRequires: libfuse-devel >= 2.9.2
+%{?with_malcontent:BuildRequires:      libmalcontent-devel >= 0.4.0}
 BuildRequires: libseccomp-devel
 BuildRequires: libsoup-devel >= 2.4
 BuildRequires: libxml2-devel >= 2.4
@@ -38,14 +41,18 @@ BuildRequires:      libxslt-progs
 BuildRequires: ostree-devel >= 2018.9
 BuildRequires: pkgconfig >= 1:0.24
 BuildRequires: polkit-devel >= 0.98
-BuildRequires: rpmbuild(macros) >= 1.682
+BuildRequires: rpmbuild(macros) >= 1.720
+BuildRequires: sed >= 4.0
 BuildRequires: systemd-devel
 BuildRequires: tar >= 1:1.22
 BuildRequires: xdg-dbus-proxy >= 0.1.0
+BuildRequires: xmlto
 BuildRequires: xorg-lib-libXau-devel
 BuildRequires: xz
+# no switch to disable
+%{!?with_malcontent:BuildConflicts:    libmalcontent-devel}
 Requires:      appstream-glib >= 0.5.10
-%{?with_system_bwrap:Requires: bubblewrap >= 0.2.1}
+%{?with_system_bwrap:Requires: bubblewrap >= 0.4.0}
 Requires:      ostree >= 2018.9
 Requires:      polkit >= 0.98
 Requires:      xdg-dbus-proxy >= 0.1.0
@@ -65,6 +72,7 @@ Group:                Libraries
 Requires:      dconf >= 0.26
 Requires:      glib2 >= 1:2.60
 Requires:      gpgme >= 1:1.1.8
+%{?with_malcontent:Requires:   libmalcontent >= 0.4.0}
 Requires:      libxml2 >= 2.4
 Requires:      ostree >= 2018.9
 
@@ -104,7 +112,7 @@ Biblioteka statyczna flatpak.
 Summary:       API documentation for flatpak library
 Summary(pl.UTF-8):     Dokumentacja API biblioteki flatpak
 Group:         Documentation
-%if "%{_rpmversion}" >= "5"
+%if "%{_rpmversion}" >= "4.6"
 BuildArch:     noarch
 %endif
 
@@ -128,6 +136,19 @@ Bash completion for flatpak command.
 %description -n bash-completion-flatpak -l pl.UTF-8
 Bashowe uzupełnianie parametrów polecenia flatpak.
 
+%package -n fish-completion-flatpak
+Summary:       Fish completion for flatpak commands
+Summary(pl.UTF-8):     Dopełnianie składni poleceń flatpak w fish
+Group:         Applications/Shells
+Requires:      %{name} = %{version}-%{release}
+Requires:      fish
+
+%description -n fish-completion-flatpak
+Fish completion for flatpak commands.
+
+%description -n fish-completion-flatpak -l pl.UTF-8
+Dopełnianie składni poleceń flatpak w fish.
+
 %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
@@ -144,6 +165,8 @@ Uzupełnianie parametrów polecenia flatpak w powłoce ZSH.
 %prep
 %setup -q
 
+%{__sed} -i -e '1s,/usr/bin/env python3,%{__python3},' scripts/flatpak-{bisect,coredumpctl}
+
 %build
 %configure \
        --disable-silent-rules \
@@ -181,6 +204,7 @@ rm -rf $RPM_BUILD_ROOT
 %if %{without system_bwrap}
 %attr(755,root,root) %{_libexecdir}/flatpak-bwrap
 %endif
+%attr(755,root,root) %{_libexecdir}/flatpak-oci-authenticator
 %attr(755,root,root) %{_libexecdir}/flatpak-portal
 %attr(755,root,root) %{_libexecdir}/flatpak-session-helper
 %attr(755,root,root) %{_libexecdir}/flatpak-system-helper
@@ -190,10 +214,12 @@ rm -rf $RPM_BUILD_ROOT
 /etc/dbus-1/system.d/org.freedesktop.Flatpak.SystemHelper.conf
 %{_datadir}/dbus-1/services/org.freedesktop.Flatpak.service
 %{_datadir}/dbus-1/system-services/org.freedesktop.Flatpak.SystemHelper.service
+%{_datadir}/dbus-1/services/org.flatpak.Authenticator.Oci.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
+%{systemduserunitdir}/flatpak-oci-authenticator.service
 %{systemduserunitdir}/flatpak-portal.service
 %{systemduserunitdir}/flatpak-session-helper.service
 %attr(755,root,root) /usr/lib/systemd/user-environment-generators/60-flatpak
@@ -215,6 +241,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.Flatpak.Authenticator.xml
 %{_datadir}/dbus-1/interfaces/org.freedesktop.portal.Flatpak.xml
 
 %files devel
@@ -238,6 +265,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %{bash_compdir}/flatpak
 
+%files -n fish-completion-flatpak
+%defattr(644,root,root,755)
+%{fish_compdir}
 %files -n zsh-completion-flatpak
 %defattr(644,root,root,755)
 %{zsh_compdir}/_flatpak