diff --git a/module-init-tools.spec b/module-init-tools.spec index 2c3db46..ab06ab5 100644 --- a/module-init-tools.spec +++ b/module-init-tools.spec @@ -17,6 +17,8 @@ Patch0: module-init-tools-fix-nfs-local.patch Exclusiveos: Linux Obsoletes: modutils-devel modutils Requires(pre): /sbin/chkconfig sh-utils +Conflicts: filesystem < 3 +Provides: /sbin/modprobe Provides: modutils = %{version} BuildRequires: docbook-utils glibc-static zlib-devel zlib-static BuildRoot: %{_tmppath}/%{name}-root @@ -41,22 +43,20 @@ make %install rm -rf $RPM_BUILD_ROOT -%makeinstall sbindir=$RPM_BUILD_ROOT/sbin +%makeinstall sbindir=$RPM_BUILD_ROOT%{_sbindir} -mkdir -p $RPM_BUILD_ROOT/etc mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d # New configuration files we ship should go in /lib/modprobe.d # in order to allow the local admin to customize /etc/modprobe.d -mkdir -p $RPM_BUILD_ROOT/lib -mkdir -p $RPM_BUILD_ROOT/lib/modprobe.d +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/modprobe.d -install -m 755 %{SOURCE2} $RPM_BUILD_ROOT/sbin/weak-modules +install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_sbindir}/weak-modules mkdir -p $RPM_BUILD_ROOT/etc/depmod.d install -m 644 %{SOURCE3} $RPM_BUILD_ROOT/etc/depmod.d/dist.conf -mv $RPM_BUILD_ROOT/%{_bindir}/lsmod $RPM_BUILD_ROOT/sbin +mv $RPM_BUILD_ROOT%{_bindir}/lsmod $RPM_BUILD_ROOT%{_sbindir}/ touch $RPM_BUILD_ROOT/etc/modprobe.d/local.conf @@ -76,9 +76,9 @@ fi %files %defattr(-,root,root) /etc/modprobe.d -/lib/modprobe.d +%{_prefix}/lib/modprobe.d /etc/depmod.d -/sbin/* +%{_sbindir}/* %{_mandir}/*/* %ghost %config(noreplace) %verify(not md5 size mtime) /etc/modprobe.d/local.conf