From ad84f86b964bd09d14537b184528dedbe73224b3 Mon Sep 17 00:00:00 2001 From: Ondřej Lysoněk Date: Nov 15 2018 11:02:33 +0000 Subject: Ship modprobe.d files in /usr/lib/modprobe.d (rhbz#1195285) --- diff --git a/i2c-tools.spec b/i2c-tools.spec index 1e633c5..3bac09f 100644 --- a/i2c-tools.spec +++ b/i2c-tools.spec @@ -12,7 +12,7 @@ Name: i2c-tools Version: 4.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A heterogeneous set of I2C tools for Linux License: GPLv2+ URL: https://i2c.wiki.kernel.org/index.php/I2C_Tools @@ -27,7 +27,7 @@ Patch2: 0003-py-smbus-Fix-FSF-address-in-smbusmodule.c.patch # Upstream patch fixing license headers of libi2c Patch3: 0001-libi2c-Mention-the-correct-license-in-source-files.patch -# for /etc/udev/makedev.d resp /etc/modprobe.d ownership +# for /etc/udev/makedev.d resp /usr/lib/modprobe.d ownership Requires: systemd-udev kmod Requires: libi2c%{?_isa} = %{version}-%{release} BuildRequires: perl-generators @@ -157,9 +157,9 @@ rm -f $RPM_BUILD_ROOT%{_bindir}/decode-edid.pl rm -f $RPM_BUILD_ROOT%{_bindir}/{ddcmon,decode-edid} # for i2c-dev ondemand loading through kmod -mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d echo "alias char-major-89-* i2c-dev" > \ - $RPM_BUILD_ROOT%{_sysconfdir}/modprobe.d/i2c-dev.conf + $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d/i2c-dev.conf # for /dev/i2c-# creation (which are needed for kmod i2c-dev autoloading) mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/udev/makedev.d for (( i = 0 ; i < 8 ; i++ )) do @@ -185,7 +185,7 @@ exit 0 %files %license COPYING %doc CHANGES README -%config(noreplace) %{_sysconfdir}/modprobe.d/i2c-dev.conf +%config(noreplace) %{_prefix}/lib/modprobe.d/i2c-dev.conf %config(noreplace) %{_sysconfdir}/udev/makedev.d/99-i2c-dev.nodes %{_sbindir}/i2c* %exclude %{_sbindir}/i2c-stub* @@ -227,6 +227,9 @@ exit 0 %changelog +* Thu Nov 15 2018 Ondřej Lysoněk - 4.0-12 +- Ship modprobe.d files in /usr/lib/modprobe.d (rhbz#1195285) + * Mon Aug 13 2018 Peter Robinson 4.0-11 - Add requires on libi2c NVR - Minor spec cleanups, use %%license