From be24df90598eb05abe3b2fe473448e414c023f0c16173b78005b24ddd11bbc52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Fri, 24 Nov 2017 07:06:33 +0000 Subject: [PATCH] Accepting request 544714 from home:RBrownSUSE:branches:server:mail Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544714 OBS-URL: https://build.opensuse.org/package/show/server:mail/fetchmail?expand=0&rev=78 --- fetchmail.changes | 6 ++++++ fetchmail.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/fetchmail.changes b/fetchmail.changes index d2d53dd..01b26c4 100644 --- a/fetchmail.changes +++ b/fetchmail.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:43:10 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Nov 13 17:18:00 UTC 2017 - vcizek@suse.com diff --git a/fetchmail.spec b/fetchmail.spec index a0e9ca5..443ac0a 100644 --- a/fetchmail.spec +++ b/fetchmail.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: fetchmail Version: 6.3.26 Release: 0 @@ -111,8 +116,8 @@ install -m 0755 %{SOURCE8} %{buildroot}/%{_libexecdir}/%{name}-systemd-exec mkdir -p %{buildroot}%{_sbindir} ln -s service %{buildroot}%{_sbindir}/rc%{name} touch %{buildroot}%{_sysconfdir}/fetchmailrc -mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates -cp sysconfig.%{name} %{buildroot}%{_localstatedir}/adm/fillup-templates +mkdir -p %{buildroot}%{_fillupdir} +cp sysconfig.%{name} %{buildroot}%{_fillupdir} mkdir -p %{buildroot}%{_localstatedir}/log touch %{buildroot}%{_localstatedir}/log/fetchmail mkdir -p %{buildroot}%{_localstatedir}/lib/fetchmail @@ -160,7 +165,7 @@ fi %{_sbindir}/rc%{name} %{_libexecdir}/%{name}-systemd-exec %{_libexecdir}/tmpfiles.d/%{name}.conf -%{_localstatedir}/adm/fillup-templates/sysconfig.%{name} +%{_fillupdir}/sysconfig.%{name} %files -n fetchmailconf %defattr(-, root, root)