From de0e9751b2285d4abf79d77d59a37a73545a849a37c966213e37540423d279b2 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:56 +0000 Subject: [PATCH] Accepting request 544644 from home:RBrownSUSE:branches:X11:RemoteDesktop Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544644 OBS-URL: https://build.opensuse.org/package/show/X11:RemoteDesktop/xrdp?expand=0&rev=29 --- xrdp.changes | 6 ++++++ xrdp.spec | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/xrdp.changes b/xrdp.changes index ee412ea..55b8ac1 100644 --- a/xrdp.changes +++ b/xrdp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:36:58 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Thu Sep 28 04:19:45 UTC 2017 - fezhang@suse.com diff --git a/xrdp.spec b/xrdp.spec index a374651..11c2e58 100644 --- a/xrdp.spec +++ b/xrdp.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 + %define _fwdefdir %{_sysconfdir}/sysconfig/SuSEfirewall2.d/services Name: xrdp Version: 0.9.4 @@ -116,8 +121,8 @@ find %{buildroot} -name '*.a' -delete find %{buildroot} -type f -name "*.la" -delete -print mkdir -p %{buildroot}/%{_fwdefdir} install -m 644 %{SOURCE3} %{buildroot}/%{_fwdefdir}/xrdp -mkdir -p %{buildroot}/%{_localstatedir}/adm/fillup-templates -install -m 644 %{SOURCE4} %{buildroot}/%{_localstatedir}/adm/fillup-templates/sysconfig.xrdp +mkdir -p %{buildroot}/%{_fillupdir} +install -m 644 %{SOURCE4} %{buildroot}/%{_fillupdir}/sysconfig.xrdp mkdir -p %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp install -m 755 %{SOURCE5} %{buildroot}/%{_prefix}/lib/initscripts/legacy-actions/xrdp/force_stop @@ -196,7 +201,7 @@ exit 0 %config(noreplace) %{_sysconfdir}/xrdp/ %ghost %config(noreplace) %{_sysconfdir}/xrdp/rsakeys.ini -%config %{_localstatedir}/adm/fillup-templates/sysconfig.xrdp +%config %{_fillupdir}/sysconfig.xrdp %files devel %defattr(-,root,root)