Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package xboxdrv for openSUSE:Factory checked in at 2022-03-10 22:46:03 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xboxdrv (Old) and /work/SRC/openSUSE:Factory/.xboxdrv.new.2349 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xboxdrv" Thu Mar 10 22:46:03 2022 rev:10 rq:960842 version:0.8.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xboxdrv/xboxdrv.changes 2022-01-11 22:48:56.497772070 +0100 +++ /work/SRC/openSUSE:Factory/.xboxdrv.new.2349/xboxdrv.changes 2022-03-11 11:38:00.526388434 +0100 @@ -1,0 +2,7 @@ +Mon Mar 7 20:22:50 UTC 2022 - Martin Wilck <mwi...@suse.com> + +- Fix modprobe.d location for 15.3 +- Add code for safe modprobe.d migration + (https://en.opensuse.org/openSUSE:Packaging_UsrEtc) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xboxdrv.spec ++++++ --- /var/tmp/diff_new_pack.OQ8inF/_old 2022-03-11 11:38:00.998388962 +0100 +++ /var/tmp/diff_new_pack.OQ8inF/_new 2022-03-11 11:38:01.002388968 +0100 @@ -1,7 +1,7 @@ # # spec file for package xboxdrv # -# 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 before %define _modprobedir /lib/modprobe.d %endif +%global modprobe_d_files 50-xpad.conf + Name: xboxdrv Version: 0.8.8 Release: 0 @@ -89,6 +92,11 @@ %pre %service_add_pre %{name}.service +# 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 %service_add_post %{name}.service @@ -99,6 +107,13 @@ %postun %service_del_postun %{name}.service +%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 %license COPYING %doc AUTHORS NEWS PROTOCOL README.md TODO @@ -106,6 +121,7 @@ %if 0%{?suse_version} < 1550 && 0%{?sle_version} < 150300 %dir %{_modprobedir} %endif +%dir %{_modprobedir} %{_modprobedir}/50-xpad.conf %{_bindir}/%{name} %{_sbindir}/rc%{name}
