From 8ccc2d47d3a5dcfdaec5dea3de833c030583d29a57347804b76b1cab973c695e Mon Sep 17 00:00:00 2001 From: Samuel Cabrero Date: Wed, 29 Apr 2020 09:47:44 +0000 Subject: [PATCH] Accepting request 798828 from home:dimstar:Factory - Use %_tmpfilesdir instead of the wrong %_libexecdir/tmpfiles.d notation: libexecdir is likely changing away from /usr/lib to /usr/libexec. - Use %_tmpfilesdir instead of the wrong %_libexecdir/tmpfiles.d notation: libexecdir is likely changing away from /usr/lib to /usr/libexec. OBS-URL: https://build.opensuse.org/request/show/798828 OBS-URL: https://build.opensuse.org/package/show/network/krb5?expand=0&rev=230 --- krb5-mini.changes | 7 +++++++ krb5-mini.spec | 6 +++--- krb5.changes | 7 +++++++ krb5.spec | 6 +++--- 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/krb5-mini.changes b/krb5-mini.changes index b1c4ed2..9267f69 100644 --- a/krb5-mini.changes +++ b/krb5-mini.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 29 08:06:31 UTC 2020 - Dominique Leuenberger + +- Use %_tmpfilesdir instead of the wrong %_libexecdir/tmpfiles.d + notation: libexecdir is likely changing away from /usr/lib to + /usr/libexec. + ------------------------------------------------------------------- Wed Mar 25 09:20:38 UTC 2020 - Samuel Cabrero diff --git a/krb5-mini.spec b/krb5-mini.spec index 2341894..8573b16 100644 --- a/krb5-mini.spec +++ b/krb5-mini.spec @@ -159,8 +159,8 @@ install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}%{_sysconfdir}/profile # Do not write directly to /var/lib/kerberos anymore as it breaks transactional # updates. Use systemd-tmpfiles to copy the files there when it doesn't exist -install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d/ -install -m 644 %{SOURCE6} %{buildroot}%{_prefix}/lib/tmpfiles.d/krb5.conf +install -d -m 0755 %{buildroot}%{_tmpfilesdir} +install -m 644 %{SOURCE6} %{buildroot}%{_tmpfilesdir}/krb5.conf mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5kdc # Where per-user keytabs live by default. mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5/user @@ -301,7 +301,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %{_libdir}/libkrad.so.* %{_libdir}/krb5/plugins/kdb/* %{_libdir}/krb5/plugins/tls/* -%{_libexecdir}/tmpfiles.d/krb5.conf +%{_tmpfilesdir}/krb5.conf %dir %{_datadir}/kerberos/ %dir %{_datadir}/kerberos/krb5kdc %dir %{_datadir}/kerberos/krb5 diff --git a/krb5.changes b/krb5.changes index 308df17..301dda5 100644 --- a/krb5.changes +++ b/krb5.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Apr 29 08:04:32 UTC 2020 - Dominique Leuenberger + +- Use %_tmpfilesdir instead of the wrong %_libexecdir/tmpfiles.d + notation: libexecdir is likely changing away from /usr/lib to + /usr/libexec. + ------------------------------------------------------------------- Wed Mar 25 09:20:38 UTC 2020 - Samuel Cabrero diff --git a/krb5.spec b/krb5.spec index f0c62ef..536bfa6 100644 --- a/krb5.spec +++ b/krb5.spec @@ -225,8 +225,8 @@ install -m 644 %{vendorFiles}/krb5.sh.profile %{buildroot}%{_sysconfdir}/profile # Do not write directly to /var/lib/kerberos anymore as it breaks transactional # updates. Use systemd-tmpfiles to copy the files there when it doesn't exist -install -d -m 0755 %{buildroot}%{_prefix}/lib/tmpfiles.d/ -install -m 644 %{SOURCE7} %{buildroot}%{_prefix}/lib/tmpfiles.d/krb5.conf +install -d -m 0755 %{buildroot}%{_tmpfilesdir} +install -m 644 %{SOURCE7} %{buildroot}%{_tmpfilesdir}/krb5.conf mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5kdc # Where per-user keytabs live by default. mkdir -p %{buildroot}/%{_datadir}/kerberos/krb5/user @@ -373,7 +373,7 @@ rm -f %{buildroot}/%{_libdir}/krb5/plugins/preauth/test.so %{_unitdir}/kadmind.service %{_unitdir}/krb5kdc.service %{_unitdir}/kpropd.service -%{_libexecdir}/tmpfiles.d/krb5.conf +%{_tmpfilesdir}/krb5.conf %dir %{krb5docdir} %dir %{_prefix}/lib/mit %dir %{_prefix}/lib/mit/sbin