From 208c1e3bd9b22b82c4f7763e1787a25439ae690751571b46ff42e372c32f5a16 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:19 +0000 Subject: [PATCH] Accepting request 544791 from home:RBrownSUSE:branches:Java:packages Replace references to /var/adm/fillup-templates with new %_fillupdir macro (boo#1069468) OBS-URL: https://build.opensuse.org/request/show/544791 OBS-URL: https://build.opensuse.org/package/show/Java:packages/hsqldb?expand=0&rev=28 --- hsqldb.changes | 6 ++++++ hsqldb.spec | 9 +++++++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/hsqldb.changes b/hsqldb.changes index f005ee0..572ba88 100644 --- a/hsqldb.changes +++ b/hsqldb.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 23 13:50:25 UTC 2017 - rbrown@suse.com + +- Replace references to /var/adm/fillup-templates with new + %_fillupdir macro (boo#1069468) + ------------------------------------------------------------------- Fri Sep 29 06:52:51 UTC 2017 - fstrba@suse.com diff --git a/hsqldb.spec b/hsqldb.spec index 209bdab..0239cda 100644 --- a/hsqldb.spec +++ b/hsqldb.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: hsqldb Version: 2.3.3 Release: 0 @@ -145,8 +150,8 @@ install -d -m 0755 %{buildroot}/%{_sbindir}/ ln -sf service %{buildroot}/%{_sbindir}/rc%{name} # sysconfig -#install -d -m 0755 %{buildroot}/var/adm/fillup-templates -#install -m 700 %{SOURCE1} %{buildroot}/var/adm/fillup-templates/sysconfig.%{name} +#install -d -m 0755 %{buildroot}%{_fillupdir} +#install -m 700 %{SOURCE1} %{buildroot}%{_fillupdir}/sysconfig.%{name} install -d -m 0755 %{buildroot}/%{_sysconfdir} install -m 0644 %{SOURCE1} %{buildroot}/%{_sysconfdir}/%{name}.conf