Accepting request 750957 from GNOME:Factory

- Package empty /etc/flatpak/remotes.d. (forwarded request 750870 from fcrozat)

OBS-URL: https://build.opensuse.org/request/show/750957
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/flatpak?expand=0&rev=36
This commit is contained in:
Dominique Leuenberger 2019-11-29 14:57:42 +00:00 committed by Git OBS Bridge
commit 9d177d78a7
2 changed files with 17 additions and 2 deletions

View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Nov 25 16:59:29 UTC 2019 - Frederic Crozat <fcrozat@suse.com>
- Package empty /etc/flatpak/remotes.d.
-------------------------------------------------------------------
Wed Nov 20 12:53:08 UTC 2019 - Dominique Leuenberger <dimstar@opensuse.org>
- Add pkgconfig(libsystemd) BuildRequires (boo#1157126).
- Drop systemd_requires: strictly speaking, we do not require
systemd.
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Oct 21 19:10:42 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com> Mon Oct 21 19:10:42 UTC 2019 - Bjørn Lie <bjorn.lie@gmail.com>

View File

@ -1,7 +1,7 @@
# #
# spec file for package flatpak # spec file for package flatpak
# #
# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # Copyright (c) 2019 SUSE LLC.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -66,6 +66,7 @@ BuildRequires: pkgconfig(libarchive) >= 2.8.0
BuildRequires: pkgconfig(libelf) >= 0.8.12 BuildRequires: pkgconfig(libelf) >= 0.8.12
BuildRequires: pkgconfig(libseccomp) BuildRequires: pkgconfig(libseccomp)
BuildRequires: pkgconfig(libsoup-2.4) BuildRequires: pkgconfig(libsoup-2.4)
BuildRequires: pkgconfig(libsystemd)
BuildRequires: pkgconfig(ostree-1) >= 2018.7 BuildRequires: pkgconfig(ostree-1) >= 2018.7
BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(polkit-gobject-1)
BuildRequires: pkgconfig(systemd) BuildRequires: pkgconfig(systemd)
@ -79,7 +80,6 @@ Recommends: %{name}-lang = %{version}
# Remove after openSUSE Leap 42 is out of scope # Remove after openSUSE Leap 42 is out of scope
Provides: xdg-app = %{version} Provides: xdg-app = %{version}
Obsoletes: xdg-app < %{version} Obsoletes: xdg-app < %{version}
%{?systemd_requires}
%description %description
flatpak is a system for building, distributing and running sandboxed desktop flatpak is a system for building, distributing and running sandboxed desktop
@ -179,6 +179,8 @@ install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-flatpak.conf
rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/ rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/
%endif %endif
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
@ -230,6 +232,7 @@ rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/
%{_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
# Own dirs so we don't have to depend on gdm for building. # Own dirs so we don't have to depend on gdm for building.
%dir %{_datadir}/gdm/ %dir %{_datadir}/gdm/
%dir %{_datadir}/gdm/env.d/ %dir %{_datadir}/gdm/env.d/