diff --git a/wsdd.changes b/wsdd.changes index cf7182f..6c42a7e 100644 --- a/wsdd.changes +++ b/wsdd.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Sun Feb 28 10:53:10 UTC 2021 - Herbert Graeber + +- Cleanup spec file + * Use %{_tmpfilesdir} instead of explicit path + * Fix requirements for %fillup_only + ------------------------------------------------------------------- Sun Feb 7 10:44:20 UTC 2021 - Herbert Graeber diff --git a/wsdd.spec b/wsdd.spec index 9288830..8b2cefa 100644 --- a/wsdd.spec +++ b/wsdd.spec @@ -31,7 +31,7 @@ Source5: %{name}.conf Patch1: %{name}-shebang.patch BuildRequires: firewall-macros BuildRequires: python3 -Requires: sysconfig +Requires(post): %fillup_prereq Supplements: samba Supplements: samba-ad-dc BuildArch: noarch @@ -61,7 +61,7 @@ install -m 644 -D %{SOURCE4} %{buildroot}%{_fillupdir}/sysconfig.wsdd install -m 755 -d %{buildroot}%{_sbindir} ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc%{name} mkdir -p %{buildroot}%{_prefix}/lib/tmpfiles.d/ -install -m 644 %{SOURCE5} %{buildroot}%{_prefix}/lib/tmpfiles.d/ +install -m 644 %{SOURCE5} %{buildroot}%{_tmpfilesdir} mkdir -p %{buildroot}/run/wsdd mkdir -p %{buildroot}%{_localstatedir}/lib/wsdd @@ -91,8 +91,8 @@ getent passwd wsdd >/dev/null || %{_sbindir}/useradd -r -g wsdd -c "User for wsd %{_unitdir}/wsdd.service %dir %{_libexecdir} %{_libexecdir}/wsdd-init.sh -%dir %{_prefix}/lib/tmpfiles.d -%{_prefix}/lib/tmpfiles.d/wsdd.conf +%dir %{_tmpfilesdir} +%{_tmpfilesdir}/wsdd.conf %dir %{_prefix}/lib/firewalld %dir %{_prefix}/lib/firewalld/services %{_prefix}/lib/firewalld/services/wsdd.xml