Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package pcfclock for openSUSE:Factory checked in at 2022-03-08 20:32:21 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pcfclock (Old) and /work/SRC/openSUSE:Factory/.pcfclock.new.2349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pcfclock" Tue Mar 8 20:32:21 2022 rev:27 rq:960191 version:0.44 Changes: -------- --- /work/SRC/openSUSE:Factory/pcfclock/pcfclock.changes 2021-08-25 20:59:55.617025806 +0200 +++ /work/SRC/openSUSE:Factory/.pcfclock.new.2349/pcfclock.changes 2022-03-11 11:49:00.906819880 +0100 @@ -1,0 +2,7 @@ +Mon Mar 7 20:05:06 UTC 2022 - Martin Wilck <mwi...@suse.com> + +- use /lib/modprobe.d in 15.3, too +- Add code for safe modprobe.d migration + (https://en.opensuse.org/openSUSE:Packaging_UsrEtc) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pcfclock.spec ++++++ --- /var/tmp/diff_new_pack.U7uHjq/_old 2022-03-11 11:49:01.394820454 +0100 +++ /var/tmp/diff_new_pack.U7uHjq/_new 2022-03-11 11:49:01.398820459 +0100 @@ -1,7 +1,7 @@ # # spec file for package pcfclock # -# Copyright (c) 2020 SUSE LLC +# Copyright (c) 2022 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -15,10 +15,13 @@ # Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300 -# systemd-rpm-macros(or kmod) is wrong in 15.2 + +%if 0%{?suse_version} < 1550 && 0%{?sle_version} <= 150300 +# systemd-rpm-macros is wrong in 15.3 and below %define _modprobedir /lib/modprobe.d %endif +%global modprobe_d_files 50-pcfclock.conf + Name: pcfclock Version: 0.44 Release: 0 @@ -111,10 +114,24 @@ install -m 0644 %{SOURCE3} %{buildroot}%{_tmpfilesdir} %endif +%pre +# Avoid restoring outdated stuff in posttrans +for _f in %{?modprobe_d_files}; do + [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ + mv -f "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}.rpmsave.old" || : +done + %post # Create devices nodes at installation time systemd-tmpfiles --create %{_tmpfilesdir}/pcfclock.conf +%posttrans +# Migration of modprobe.conf files to _modprobedir +for _f in %{?modprobe_d_files}; do + [ ! -f "/etc/modprobe.d/${_f}.rpmsave" ] || \ + mv -fv "/etc/modprobe.d/${_f}.rpmsave" "/etc/modprobe.d/${_f}" || : +done + %files %defattr(-,root,root) %doc README
