From a530cfc0bd5bd1977a81d6580f87e2c79fb995b97b132012073997c9ef5f8b35 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 28 Nov 2017 10:52:39 +0000 Subject: [PATCH] - Don't require systemd: if it's there, we will use it, if it is not there like in a base container image, there is nothing to do for us. OBS-URL: https://build.opensuse.org/package/show/Base:System/issue-generator?expand=0&rev=8 --- issue-generator.changes | 7 +++++++ issue-generator.spec | 10 +++------- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/issue-generator.changes b/issue-generator.changes index 584bd5a..d5d0f6b 100644 --- a/issue-generator.changes +++ b/issue-generator.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Tue Nov 28 11:51:23 CET 2017 - kukuk@suse.de + +- Don't require systemd: if it's there, we will use it, if it is + not there like in a base container image, there is nothing to do + for us. + ------------------------------------------------------------------- Thu Nov 23 13:42:31 UTC 2017 - rbrown@suse.com diff --git a/issue-generator.spec b/issue-generator.spec index ac23a75..5b8d9a6 100644 --- a/issue-generator.spec +++ b/issue-generator.spec @@ -16,11 +16,6 @@ # -#Compat macro for new _fillupdir macro introduced in Nov 2017 -%if ! %{defined _fillupdir} - %define _fillupdir /var/adm/fillup-templates -%endif - Name: issue-generator Version: 1.3 Release: 0 @@ -33,7 +28,6 @@ BuildRequires: fdupes Requires(post): %fillup_prereq BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch -%{?systemd_requires} %description issue-generator is a tool to create an issue file dynamically. @@ -57,7 +51,9 @@ install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_fillupdir}/ %service_add_pre issue-generator.service issue-add-ssh-keys.service %post -%{_bindir}/systemd-tmpfiles --create issue-generator.conf ||: +if [ -x %{_bindir}/systemd-tmpfiles ]; then + %{_bindir}/systemd-tmpfiles --create issue-generator.conf ||: +fi %{fillup_only -n issue-generator} %service_add_post issue-generator.service issue-add-ssh-keys.service