From 063ef138efb9d5f5c36e3ba4430e7fdaa6df47ac2730fd6c18486fe399394fa1 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Nov 2019 09:25:29 +0000 Subject: [PATCH 1/2] Accepting request 749895 from GNOME:Next - Add pkgconfig(libsystemd) BuildRequires (boo#1157126). - Drop systemd_requires: strictly speaking, we do not require systemd. OBS-URL: https://build.opensuse.org/request/show/749895 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=88 --- flatpak.changes | 7 +++++++ flatpak.spec | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/flatpak.changes b/flatpak.changes index 35a746a..49edd99 100644 --- a/flatpak.changes +++ b/flatpak.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Nov 20 12:53:08 UTC 2019 - Dominique Leuenberger + +- 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 diff --git a/flatpak.spec b/flatpak.spec index 6ae206b..e8599a4 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -1,7 +1,7 @@ # # 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 # 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(libseccomp) BuildRequires: pkgconfig(libsoup-2.4) +BuildRequires: pkgconfig(libsystemd) BuildRequires: pkgconfig(ostree-1) >= 2018.7 BuildRequires: pkgconfig(polkit-gobject-1) BuildRequires: pkgconfig(systemd) @@ -79,7 +80,6 @@ Recommends: %{name}-lang = %{version} # Remove after openSUSE Leap 42 is out of scope Provides: xdg-app = %{version} Obsoletes: xdg-app < %{version} -%{?systemd_requires} %description flatpak is a system for building, distributing and running sandboxed desktop From 36993768294b105afbec1e371b4a1b65af2041a8980ae34414457255c4c98531 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Tue, 26 Nov 2019 09:30:31 +0000 Subject: [PATCH 2/2] Accepting request 750870 from home:fcrozat:branches:GNOME:Factory - Package empty /etc/flatpak/remotes.d. OBS-URL: https://build.opensuse.org/request/show/750870 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/flatpak?expand=0&rev=89 --- flatpak.changes | 5 +++++ flatpak.spec | 3 +++ 2 files changed, 8 insertions(+) diff --git a/flatpak.changes b/flatpak.changes index 49edd99..ab138b1 100644 --- a/flatpak.changes +++ b/flatpak.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Nov 25 16:59:29 UTC 2019 - Frederic Crozat + +- Package empty /etc/flatpak/remotes.d. + ------------------------------------------------------------------- Wed Nov 20 12:53:08 UTC 2019 - Dominique Leuenberger diff --git a/flatpak.spec b/flatpak.spec index e8599a4..4e57872 100644 --- a/flatpak.spec +++ b/flatpak.spec @@ -179,6 +179,8 @@ install -m 644 %{SOURCE1} %{buildroot}%{_sysusersdir}/system-user-flatpak.conf rm -Rf %{buildroot}%{_libexecdir}/systemd/user-environment-generators/ %endif +mkdir -p %{buildroot}%{_sysconfdir}/flatpak/remotes.d + %find_lang %{name} %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} %{_datadir}/%{name}/ %config %{_sysconfdir}/profile.d/flatpak.sh +%{_sysconfdir}/flatpak # Own dirs so we don't have to depend on gdm for building. %dir %{_datadir}/gdm/ %dir %{_datadir}/gdm/env.d/