diff --git a/debian/changelog b/debian/changelog index c9f8c2e6aa6..f0e5303eccc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +daos (2.5.100-14) unstable; urgency=medium + [ Brian J. Murrell ] + * NOOP change to keep in parity with RPM version + + -- Brian J. Murrell Tue, 09 Jan 2024 13:59:01 -0500 + daos (2.5.100-13) unstable; urgency=medium [ Brian J. Murrell ] * Update for EL 8.8 and Leap 15.5 diff --git a/utils/rpms/daos.spec b/utils/rpms/daos.spec index d9dce510b12..a04a0f6a346 100644 --- a/utils/rpms/daos.spec +++ b/utils/rpms/daos.spec @@ -15,7 +15,7 @@ Name: daos Version: 2.5.100 -Release: 13%{?relval}%{?dist} +Release: 14%{?relval}%{?dist} Summary: DAOS Storage Engine License: BSD-2-Clause-Patent @@ -383,6 +383,7 @@ getent passwd daos_server >/dev/null || useradd -s /sbin/nologin -r -g daos_serv %preun server %systemd_preun %{server_svc_name} +# all of these macros are empty on EL so keep rpmlint happy %if (0%{?suse_version} > 0) %postun server %{?run_ldconfig} @@ -408,7 +409,6 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent %files %defattr(-, root, root, -) %doc README.md -%{_sysconfdir}/ld.so.conf.d/daos.conf %dir %attr(0755,root,root) %{conf_dir}/certs %config(noreplace) %{conf_dir}/memcheck-cart.supp %dir %{conf_dir} @@ -433,6 +433,7 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent %attr(2755,root,daos_server) %{_bindir}/daos_server %{_bindir}/daos_engine %{_bindir}/daos_metrics +%{_sysconfdir}/ld.so.conf.d/daos.conf %dir %{_libdir}/daos_srv %{_libdir}/daos_srv/libcont.so %{_libdir}/daos_srv/libdtx.so @@ -585,6 +586,9 @@ getent passwd daos_agent >/dev/null || useradd -s /sbin/nologin -r -g daos_agent # No files in a shim package %changelog +* Tue Jan 09 2024 Brian J. Murrell 2.5.100-14 +- Move /etc/ld.so.conf.d/daos.conf to daos-server sub-package + * Wed Dec 06 2023 Brian J. Murrell 2.5.100-13 - Update for EL 8.8 and Leap 15.5 - Update raft to 0.10.1-2.411.gefa15f4