From f300109c3b422650d8d4fbebf5072a93aedb08cd696f645908390ae519ab72a6 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Thu, 23 Nov 2017 15:12:59 +0000 Subject: [PATCH 1/3] Accepting request 544706 from home:RBrownSUSE:branches:Base:System Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544706 OBS-URL: https://build.opensuse.org/package/show/Base:System/issue-generator?expand=0&rev=7 --- issue-generator.changes | 6 ++++++ issue-generator.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/issue-generator.changes b/issue-generator.changes index 48b0c92..584bd5a 100644 --- a/issue-generator.changes +++ b/issue-generator.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:42:31 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Wed May 31 15:18:23 CEST 2017 - kukuk@suse.de diff --git a/issue-generator.spec b/issue-generator.spec index 6b92195..ac23a75 100644 --- a/issue-generator.spec +++ b/issue-generator.spec @@ -16,6 +16,11 @@ # +#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 @@ -44,8 +49,8 @@ make %{?_smp_mflags} make %{?_smp_mflags} DESTDIR=%{buildroot} install ln -sf service %{buildroot}%{_sbindir}/rcissue-generator ln -sf service %{buildroot}%{_sbindir}/rcissue-add-ssh-keys -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/fillup-templates/ +mkdir -p %{buildroot}%{_fillupdir} +install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_fillupdir}/ %fdupes %{buildroot}%{_mandir} %pre @@ -71,7 +76,7 @@ install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_localstatedir}/adm/ %dir %{_prefix}/lib/tmpfiles.d %dir %{_prefix}/lib/udev %dir %{_prefix}/lib/udev/rules.d -%{_localstatedir}/adm/fillup-templates/sysconfig.issue-generator +%{_fillupdir}/sysconfig.issue-generator %{_prefix}/lib/tmpfiles.d/issue-generator.conf %{_prefix}/lib/udev/rules.d/90-issue-generator.rules %{_prefix}/lib/systemd/system/issue-add-ssh-keys.service From a530cfc0bd5bd1977a81d6580f87e2c79fb995b97b132012073997c9ef5f8b35 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 28 Nov 2017 10:52:39 +0000 Subject: [PATCH 2/3] - 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 From a6d21145df0f40cd560a42dcd2a02ad80efd725b686326f6aca3bdf3ba289f32 Mon Sep 17 00:00:00 2001 From: Thorsten Kukuk Date: Tue, 28 Nov 2017 12:11:12 +0000 Subject: [PATCH 3/3] - Use official systemd macros in %post install OBS-URL: https://build.opensuse.org/package/show/Base:System/issue-generator?expand=0&rev=9 --- issue-generator.changes | 5 +++++ issue-generator.spec | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/issue-generator.changes b/issue-generator.changes index d5d0f6b..fc40740 100644 --- a/issue-generator.changes +++ b/issue-generator.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Tue Nov 28 13:10:37 CET 2017 - kukuk@suse.de + +- Use official systemd macros in %post install + ------------------------------------------------------------------- Tue Nov 28 11:51:23 CET 2017 - kukuk@suse.de diff --git a/issue-generator.spec b/issue-generator.spec index 5b8d9a6..7af9d38 100644 --- a/issue-generator.spec +++ b/issue-generator.spec @@ -51,9 +51,7 @@ install -m 644 udev/sysconfig.issue-generator %{buildroot}%{_fillupdir}/ %service_add_pre issue-generator.service issue-add-ssh-keys.service %post -if [ -x %{_bindir}/systemd-tmpfiles ]; then - %{_bindir}/systemd-tmpfiles --create issue-generator.conf ||: -fi +%tmpfiles_create issue-generator.conf %{fillup_only -n issue-generator} %service_add_post issue-generator.service issue-add-ssh-keys.service