From f415854c91a34dad70107765599c7f1493c799223fb4779b3ad2871c28a034c2 Mon Sep 17 00:00:00 2001 From: Dirk Mueller Date: Fri, 24 Nov 2017 10:22:43 +0000 Subject: [PATCH] Accepting request 544660 from home:RBrownSUSE:branches:network Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544660 OBS-URL: https://build.opensuse.org/package/show/network/cyrus-sasl?expand=0&rev=70 --- cyrus-sasl-saslauthd.changes | 6 ++++++ cyrus-sasl-saslauthd.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/cyrus-sasl-saslauthd.changes b/cyrus-sasl-saslauthd.changes index db970a2..0c5a876 100644 --- a/cyrus-sasl-saslauthd.changes +++ b/cyrus-sasl-saslauthd.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:38:18 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Mon Sep 4 10:01:17 UTC 2017 - vcizek@suse.com diff --git a/cyrus-sasl-saslauthd.spec b/cyrus-sasl-saslauthd.spec index 81f1a5c..117e12a 100644 --- a/cyrus-sasl-saslauthd.spec +++ b/cyrus-sasl-saslauthd.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: cyrus-sasl-saslauthd Version: 2.1.26 Release: 0 @@ -122,7 +127,7 @@ mkdir -p $RPM_BUILD_ROOT/usr/bin install -m 755 testsaslauthd $RPM_BUILD_ROOT/usr/bin/testsaslauthd cd - mkdir -p $RPM_BUILD_ROOT/sbin -install -D -m 644 SuSE/sysconfig.saslauthd $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.saslauthd +install -D -m 644 SuSE/sysconfig.saslauthd $RPM_BUILD_ROOT%{_fillupdir}/sysconfig.saslauthd rm -f $RPM_BUILD_ROOT/%{_mandir}/cat?/* rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libsasldb* rm -f $RPM_BUILD_ROOT/%{_libdir}/sasl2/libldapdb.la @@ -148,7 +153,7 @@ install -m 644 %{SOURCE4} $RPM_BUILD_ROOT/%{_unitdir} %files %defattr(-,root,root) -/var/adm/fillup-templates/sysconfig.saslauthd +%{_fillupdir}/sysconfig.saslauthd %{_unitdir}/saslauthd.service %dir %attr(0755, root, root) %ghost /run/sasl2 /usr/sbin/*