Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package uisp for openSUSE:Factory checked in at 2022-03-05 14:44:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/uisp (Old) and /work/SRC/openSUSE:Factory/.uisp.new.1958 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "uisp" Sat Mar 5 14:44:37 2022 rev:24 rq:959538 version:20050207suse Changes: -------- --- /work/SRC/openSUSE:Factory/uisp/uisp.changes 2018-08-02 14:58:40.304330853 +0200 +++ /work/SRC/openSUSE:Factory/.uisp.new.1958/uisp.changes 2022-03-05 14:45:18.511729558 +0100 @@ -1,0 +2,5 @@ +Fri Mar 4 20:12:56 UTC 2022 - Martin Wilck <[email protected]> + +- Install modprobe.conf files to %_modprobedir (bsc#1196275, jsc#SLE-20639) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ uisp.spec ++++++ --- /var/tmp/diff_new_pack.CuwmyC/_old 2022-03-05 14:45:19.223729737 +0100 +++ /var/tmp/diff_new_pack.CuwmyC/_new 2022-03-05 14:45:19.231729740 +0100 @@ -1,7 +1,7 @@ # # spec file for package uisp # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# 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 @@ -12,10 +12,15 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%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 + %define prefix /usr/avr Name: uisp @@ -25,7 +30,7 @@ %define upstream_version 20050207 Version: 20050207suse Release: 0 -Url: http://savannah.nongnu.org/projects/uisp +URL: http://savannah.nongnu.org/projects/uisp Summary: An upload tool for AVR microcontrollers License: GPL-2.0-or-later Group: Development/Tools/Other @@ -34,7 +39,8 @@ Source2: modprobe.uisp_parport Provides: avr-programmer BuildRoot: %{_tmppath}/%{name}-%{version}-build -PreReq: /bin/cat /sbin/modprobe +PreReq: /bin/cat +PreReq: /sbin/modprobe Patch1: uisp_fastpoll_3712.patch Patch2: uisp-20050207-2313+48.diff Patch3: uisp-20050207-err_msg.diff @@ -82,8 +88,8 @@ mkdir -p %{buildroot}/etc/resmgr.conf.d # no longer works for 10.2 see bugzilla #235059 # install -m 644 %{SOURCE1} %{buildroot}/etc/resmgr.conf.d/99-uisp_parport.conf -mkdir -p %{buildroot}/etc/modprobe.d -install -m 644 %{SOURCE2} %{buildroot}/etc/modprobe.d/uisp_parport.conf +mkdir -p %{buildroot}%{_modprobedir} +install -m 644 %{SOURCE2} %{buildroot}%{_modprobedir}/uisp_parport.conf %post %if %suse_version >= 1000 @@ -106,5 +112,7 @@ %dir %prefix %prefix/* %config /etc/* +%dir %{_modprobedir} +%{_modprobedir}/uisp_parport.conf %changelog
