Accepting request 867487 from GNOME:Factory
OBS-URL: https://build.opensuse.org/request/show/867487 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flatpak?expand=0&rev=55
This commit is contained in:
commit
52daf5d32d
15
_service
15
_service
@ -1,15 +0,0 @@
|
|||||||
<?xml version="1.0"?>
|
|
||||||
<services>
|
|
||||||
<service name="tar_scm" mode="disabled">
|
|
||||||
<param name="url">https://github.com/flatpak/flatpak.git</param>
|
|
||||||
<param name="scm">git</param>
|
|
||||||
<param name="versionformat">@PARENT_TAG@</param>
|
|
||||||
<param name="revision">refs/tags/1.10.0</param>
|
|
||||||
</service>
|
|
||||||
<service name="recompress" mode="disabled">
|
|
||||||
<param name="file">*.tar</param>
|
|
||||||
<param name="compression">xz</param>
|
|
||||||
</service>
|
|
||||||
<service name="set_version" mode="disabled"/>
|
|
||||||
</services>
|
|
||||||
|
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:89192f91c7f3a4bfffcf316c1eb2223f3f91f70420c9ead1faf7bada5176eae1
|
|
||||||
size 1116548
|
|
3
flatpak-1.10.1.tar.xz
Normal file
3
flatpak-1.10.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:c1354f42bf3b5d51aeb4028c9b62fd4ffc673ef2ff6e583c17777f5dafdbdcb7
|
||||||
|
size 1507668
|
@ -1,3 +1,20 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jan 28 08:00:53 UTC 2021 - Antonio Larrosa <alarrosa@suse.com>
|
||||||
|
|
||||||
|
- Flatpak only requires glib 2.44, not 2.60
|
||||||
|
- Update ostree version required to 2020.8
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jan 24 17:24:36 UTC 2021 - Andreas Stieger <andreas.stieger@gmx.de>
|
||||||
|
|
||||||
|
- Update to version 1.10.1:
|
||||||
|
+ Fix flatpak build on systems with setuid bwrap
|
||||||
|
+ Fix some compiler warnings
|
||||||
|
+ Fix crash on updating apps with no deploy data
|
||||||
|
+ Updated translations.
|
||||||
|
- Remove deprecated texinfo packaging macros.
|
||||||
|
- Switch to upstream release tarball.
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Fri Jan 15 16:06:24 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
Fri Jan 15 16:06:24 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
|
||||||
@ -29,7 +46,7 @@ Fri Jan 15 16:02:40 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
|||||||
+ This is a security update that fixes a sandbox escape where a
|
+ This is a security update that fixes a sandbox escape where a
|
||||||
malicious application can execute code outside the sandbox by
|
malicious application can execute code outside the sandbox by
|
||||||
controlling the environment of the "flatpak run" command when
|
controlling the environment of the "flatpak run" command when
|
||||||
spawning a sub-sandbox.
|
spawning a sub-sandbox (boo#1180996)
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Thu Jan 7 20:28:03 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
Thu Jan 7 20:28:03 UTC 2021 - Bjørn Lie <bjorn.lie@gmail.com>
|
||||||
|
30
flatpak.spec
30
flatpak.spec
@ -16,29 +16,27 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%define libname libflatpak0
|
||||||
# dbus only used config files in /etc until 1.9.18
|
# dbus only used config files in /etc until 1.9.18
|
||||||
%if %{pkg_vcmp dbus-1 < 1.9.18}
|
%if %{pkg_vcmp dbus-1 < 1.9.18}
|
||||||
%define _dbusconfigdir %{_sysconfdir}/dbus-1/system.d
|
%define _dbusconfigdir %{_sysconfdir}/dbus-1/system.d
|
||||||
%else
|
%else
|
||||||
%define _dbusconfigdir %{_datadir}/dbus-1/system.d
|
%define _dbusconfigdir %{_datadir}/dbus-1/system.d
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# systemd only supports environment generators since version 233
|
# systemd only supports environment generators since version 233
|
||||||
%if %{pkg_vcmp systemd < 233}
|
%if %{pkg_vcmp systemd < 233}
|
||||||
%define support_environment_generators 0
|
%define support_environment_generators 0
|
||||||
%else
|
%else
|
||||||
%define support_environment_generators 1
|
%define support_environment_generators 1
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%define libname libflatpak0
|
|
||||||
Name: flatpak
|
Name: flatpak
|
||||||
Version: 1.10.0
|
Version: 1.10.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: OSTree based application bundles management
|
Summary: OSTree based application bundles management
|
||||||
License: LGPL-2.1-or-later
|
License: LGPL-2.1-or-later
|
||||||
Group: System/Packages
|
Group: System/Packages
|
||||||
URL: https://flatpak.github.io/
|
URL: https://flatpak.github.io/
|
||||||
Source0: %{name}-%{version}.tar.xz
|
Source0: https://github.com/flatpak/flatpak/releases/download/%{version}/%{name}-%{version}.tar.xz
|
||||||
Patch0: polkit_rules_usability.patch
|
Patch0: polkit_rules_usability.patch
|
||||||
BuildRequires: bison
|
BuildRequires: bison
|
||||||
BuildRequires: bubblewrap >= 0.4.1
|
BuildRequires: bubblewrap >= 0.4.1
|
||||||
@ -59,7 +57,7 @@ BuildRequires: pkgconfig(dconf) >= 0.26
|
|||||||
BuildRequires: pkgconfig(fuse) >= 2.9.2
|
BuildRequires: pkgconfig(fuse) >= 2.9.2
|
||||||
BuildRequires: pkgconfig(gio-2.0)
|
BuildRequires: pkgconfig(gio-2.0)
|
||||||
BuildRequires: pkgconfig(gio-unix-2.0)
|
BuildRequires: pkgconfig(gio-unix-2.0)
|
||||||
BuildRequires: pkgconfig(glib-2.0) >= 2.60
|
BuildRequires: pkgconfig(glib-2.0) >= 2.44
|
||||||
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0
|
BuildRequires: pkgconfig(gobject-introspection-1.0) >= 1.40.0
|
||||||
BuildRequires: pkgconfig(gobject-introspection-no-export-1.0) >= 1.40.0
|
BuildRequires: pkgconfig(gobject-introspection-no-export-1.0) >= 1.40.0
|
||||||
BuildRequires: pkgconfig(json-glib-1.0)
|
BuildRequires: pkgconfig(json-glib-1.0)
|
||||||
@ -69,13 +67,13 @@ BuildRequires: pkgconfig(libseccomp)
|
|||||||
BuildRequires: pkgconfig(libsoup-2.4)
|
BuildRequires: pkgconfig(libsoup-2.4)
|
||||||
BuildRequires: pkgconfig(libsystemd)
|
BuildRequires: pkgconfig(libsystemd)
|
||||||
BuildRequires: pkgconfig(libzstd) >= 0.8.1
|
BuildRequires: pkgconfig(libzstd) >= 0.8.1
|
||||||
BuildRequires: pkgconfig(ostree-1) >= 2018.9
|
BuildRequires: pkgconfig(ostree-1) >= 2020.8
|
||||||
BuildRequires: pkgconfig(polkit-gobject-1)
|
BuildRequires: pkgconfig(polkit-gobject-1)
|
||||||
BuildRequires: pkgconfig(systemd)
|
BuildRequires: pkgconfig(systemd)
|
||||||
BuildRequires: pkgconfig(xau)
|
BuildRequires: pkgconfig(xau)
|
||||||
Requires: %{libname} = %{version}
|
Requires: %{libname} = %{version}
|
||||||
Requires: bubblewrap >= 0.4.1
|
Requires: bubblewrap >= 0.4.1
|
||||||
Requires: ostree >= 2018.9
|
Requires: ostree >= 2020.8
|
||||||
Requires: xdg-dbus-proxy >= 0.1.0
|
Requires: xdg-dbus-proxy >= 0.1.0
|
||||||
Requires: xdg-desktop-portal >= 0.10
|
Requires: xdg-desktop-portal >= 0.10
|
||||||
Requires: user(flatpak)
|
Requires: user(flatpak)
|
||||||
@ -96,7 +94,6 @@ Group: System/Base
|
|||||||
%description -n system-user-flatpak
|
%description -n system-user-flatpak
|
||||||
System user for the flatpak system helper.
|
System user for the flatpak system helper.
|
||||||
|
|
||||||
|
|
||||||
%package -n %{libname}
|
%package -n %{libname}
|
||||||
Summary: OSTree based application bundle management library
|
Summary: OSTree based application bundle management library
|
||||||
Group: System/Libraries
|
Group: System/Libraries
|
||||||
@ -146,11 +143,9 @@ more information.
|
|||||||
sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-*
|
sed -i -e '1s,#!%{_bindir}/env python3,#!%{_bindir}/python3,' scripts/flatpak-*
|
||||||
|
|
||||||
%build
|
%build
|
||||||
NOCONFIGURE=1 ./autogen.sh
|
|
||||||
%configure \
|
%configure \
|
||||||
--disable-silent-rules \
|
--disable-silent-rules \
|
||||||
--enable-gtk-doc \
|
--enable-gtk-doc \
|
||||||
--disable-document-portal \
|
|
||||||
--with-system-bubblewrap \
|
--with-system-bubblewrap \
|
||||||
--with-priv-mode=none \
|
--with-priv-mode=none \
|
||||||
--with-dbus-config-dir=%{_dbusconfigdir} \
|
--with-dbus-config-dir=%{_dbusconfigdir} \
|
||||||
@ -184,7 +179,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/flatpak/remotes.d
|
|||||||
%find_lang %{name}
|
%find_lang %{name}
|
||||||
|
|
||||||
%pre -n system-user-flatpak -f system-user-flatpak.pre
|
%pre -n system-user-flatpak -f system-user-flatpak.pre
|
||||||
|
|
||||||
%post -n %{libname} -p /sbin/ldconfig
|
%post -n %{libname} -p /sbin/ldconfig
|
||||||
%postun -n %{libname} -p /sbin/ldconfig
|
%postun -n %{libname} -p /sbin/ldconfig
|
||||||
%pre
|
%pre
|
||||||
@ -229,12 +223,12 @@ fi
|
|||||||
# policykit rules
|
# policykit rules
|
||||||
%{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
|
%{_datadir}/polkit-1/actions/org.freedesktop.Flatpak.policy
|
||||||
%{_datadir}/polkit-1/rules.d/60-org.freedesktop.Flatpak.rules
|
%{_datadir}/polkit-1/rules.d/60-org.freedesktop.Flatpak.rules
|
||||||
%{_mandir}/man1/%{name}*.1%{ext_man}
|
%{_mandir}/man1/%{name}*.1%{?ext_man}
|
||||||
%{_mandir}/man5/flatpak-metadata.5%{ext_man}
|
%{_mandir}/man5/flatpak-metadata.5%{?ext_man}
|
||||||
%{_mandir}/man5/flatpak-flatpakref.5%{ext_man}
|
%{_mandir}/man5/flatpak-flatpakref.5%{?ext_man}
|
||||||
%{_mandir}/man5/flatpak-flatpakrepo.5%{ext_man}
|
%{_mandir}/man5/flatpak-flatpakrepo.5%{?ext_man}
|
||||||
%{_mandir}/man5/flatpak-installation.5%{ext_man}
|
%{_mandir}/man5/flatpak-installation.5%{?ext_man}
|
||||||
%{_mandir}/man5/flatpak-remote.5%{ext_man}
|
%{_mandir}/man5/flatpak-remote.5%{?ext_man}
|
||||||
%{_datadir}/%{name}/
|
%{_datadir}/%{name}/
|
||||||
%config %{_sysconfdir}/profile.d/flatpak.sh
|
%config %{_sysconfdir}/profile.d/flatpak.sh
|
||||||
%{_sysconfdir}/flatpak
|
%{_sysconfdir}/flatpak
|
||||||
|
Loading…
Reference in New Issue
Block a user