Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package v4l2loopback for openSUSE:Factory 
checked in at 2022-03-08 20:32:02
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/v4l2loopback (Old)
 and      /work/SRC/openSUSE:Factory/.v4l2loopback.new.2349 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "v4l2loopback"

Tue Mar  8 20:32:02 2022 rev:17 rq:960158 version:0.12.5

Changes:
--------
--- /work/SRC/openSUSE:Factory/v4l2loopback/v4l2loopback.changes        
2021-02-11 12:52:44.141947316 +0100
+++ /work/SRC/openSUSE:Factory/.v4l2loopback.new.2349/v4l2loopback.changes      
2022-03-11 11:37:15.958337648 +0100
@@ -1,0 +2,5 @@
+Fri Mar  4 20:16:00 UTC 2022 - Martin Wilck <[email protected]>
+
+- Fix modprobe.d location for 15.3 and earlier (bsc#1196275, jsc#SLE-20639) 
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ v4l2loopback.spec ++++++
--- /var/tmp/diff_new_pack.PFJeVC/_old  2022-03-11 11:37:16.378338140 +0100
+++ /var/tmp/diff_new_pack.PFJeVC/_new  2022-03-11 11:37:16.386338150 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package v4l2loopback
 #
-# Copyright (c) 2021 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
@@ -17,7 +17,11 @@
 # needssslcertforbuild
 
 
-%{!?_modprobedir: %define _modprobedir /lib/modprobe.d/} 
+%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 98-v4l2loopback.conf
 %{!?_modulesloaddir: %define _modulesloaddir /usr/lib/modules-load.d/} 
 
 Name:           v4l2loopback
@@ -94,6 +98,20 @@
 install -D -m 0644 %{SOURCE2} %{buildroot}%{_modprobedir}/98-v4l2loopback.conf
 install -D -m 0644 %{SOURCE3} %{buildroot}%{_modulesloaddir}/v4l2loopback.conf
 
+%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
+
+%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 utils
 %attr(0755,root,root) %{_bindir}/v4l2loopback-ctl
 %attr(0644,root,root) %{_mandir}/man1/v4l2loopback-ctl.1.gz

Reply via email to