diff --git a/linux-firmware.spec b/linux-firmware.spec index 6e643ae..b6708ab 100644 --- a/linux-firmware.spec +++ b/linux-firmware.spec @@ -17,6 +17,7 @@ Obsoletes: ueagle-atm4-firmware < 1.0-5 # whatever happens to be in the last checkout. Requires: netxen-firmware Requires: udev +Conflicts: filesystem < 3 %description Kernel-firmware includes firmware files required for some devices to @@ -43,9 +44,9 @@ rm -f usbdux/*dux */*.asm %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/lib/firmware -cp -r * $RPM_BUILD_ROOT/lib/firmware -rm $RPM_BUILD_ROOT/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*} +mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib/firmware +cp -r * $RPM_BUILD_ROOT%{_prefix}/lib/firmware +rm $RPM_BUILD_ROOT%{_prefix}/lib/firmware/{WHENCE,LICENCE.*,LICENSE.*} %clean rm -rf $RPM_BUILD_ROOT @@ -54,7 +55,7 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc WHENCE LICENCE.* LICENSE.* -/lib/firmware/* +%{_prefix}/lib/firmware/* %changelog * Thu Aug 04 2011 Tom Callaway 20110731-2