From 12425b17855e175b40d6ae93653c671fb933f4e9 Mon Sep 17 00:00:00 2001 From: Frederic Lepied Date: Sun, 11 Mar 2018 21:34:58 +0100 Subject: [PATCH 1/3] adapt for DLRN --- systemd.spec | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/systemd.spec b/systemd.spec index f1a890d..74af778 100644 --- a/systemd.spec +++ b/systemd.spec @@ -48,10 +48,12 @@ i=1; for j in 00*patch; do printf "Patch%04d: %s\n" $i $j; i=$((i+1));done| GIT_DIR=../../src/systemd/.git git diffab -M v233..master@{2017-06-15} -- hwdb/[67]* hwdb/parse_hwdb.py > hwdb.patch %endif +%if 0%{?dlrn} == 0 Patch0001: 0001-test-cgroup-util-bail-out-when-running-under-mock.patch Patch0002: 0002-basic-fs-util-skip-fsync_directory_of_file-if-proc-s.patch Patch0998: 0998-resolved-create-etc-resolv.conf-symlink-at-runtime.patch +%endif %global num_patches %{lua: c=0; for i,p in ipairs(patches) do c=c+1; end; print(c);} @@ -263,6 +265,7 @@ They can be useful to test systemd internals. %prep %setup -q %{?gitcommit:-n %{name}-stable-%{gitcommit}} +%if 0%{?dlrn} == 0 %if %{num_patches} git init git config user.email "systemd-maint@redhat.com" @@ -274,6 +277,8 @@ They can be useful to test systemd internals. git am %{patches} %endif +%endif + # Restore systemd-user pam config from before "removal of Fedora-specific bits" cp -p %{SOURCE12} src/login/ @@ -423,6 +428,11 @@ install -Dm0644 -t %{buildroot}%{system_unit_dir}/systemd-udev-trigger.service.d install -Dm0755 -t %{buildroot}%{_prefix}/lib/kernel/install.d/ %{SOURCE11} install -D -t %{buildroot}/usr/lib/systemd/ %{SOURCE3} +%if 0%{?dlrn} == 0 +mkdir -p %{buildroot}/etc/polkit-1/localauthority/10-vendor.d +mv %{buildroot}/var/lib/polkit-1/localauthority/10-vendor.d/systemd-networkd.pkla \ + %{buildroot}/etc/polkit-1/localauthority/10-vendor.d/ +%endif %find_lang %{name} From ecd200ba43e8dee79653b17b60c23c2f2dbe4e8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 10 Apr 2018 22:00:08 +0200 Subject: [PATCH 2/3] Add dependencies useful for hwdb tests --- systemd.spec | 2 ++ 1 file changed, 2 insertions(+) diff --git a/systemd.spec b/systemd.spec index 74af778..e13b4ed 100644 --- a/systemd.spec +++ b/systemd.spec @@ -107,6 +107,8 @@ BuildRequires: git %endif BuildRequires: meson >= 0.43 BuildRequires: gettext +BuildRequires: python3-pyparsing +BuildRequires: python3-evdev Requires(post): coreutils Requires(post): sed From 1eb8bc72df8f4dccff1e094b11eefce8adda896f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Thu, 26 Apr 2018 12:17:01 +0200 Subject: [PATCH 3/3] Add deps for https://github.com/systemd/systemd/pull/8819 --- systemd.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/systemd.spec b/systemd.spec index e13b4ed..4eb4309 100644 --- a/systemd.spec +++ b/systemd.spec @@ -109,6 +109,7 @@ BuildRequires: meson >= 0.43 BuildRequires: gettext BuildRequires: python3-pyparsing BuildRequires: python3-evdev +BuildRequires: perl(IPC::SysV) Requires(post): coreutils Requires(post): sed