diff --git a/busybox.spec b/busybox.spec index 57e996e..310b7f1 100644 --- a/busybox.spec +++ b/busybox.spec @@ -21,12 +21,14 @@ BuildRequires: glibc-static # This package used to include a bundled copy of uClibc, but we now # use the system copy. BuildRequires: uClibc-static +Conflicts: filesystem < 3 %define debug_package %{nil} %package petitboot Group: System Environment/Shells Summary: Version of busybox configured for use with petitboot +Conflicts: filesystem < 3 %description Busybox is a single binary which includes versions of a large number @@ -89,9 +91,9 @@ cp docs/busybox.1 docs/busybox.petitboot.1 %install rm -rf $RPM_BUILD_ROOT -mkdir -p $RPM_BUILD_ROOT/sbin -install -m 755 busybox.static $RPM_BUILD_ROOT/sbin/busybox -install -m 755 busybox.petitboot $RPM_BUILD_ROOT/sbin/busybox.petitboot +mkdir -p $RPM_BUILD_ROOT/%{_sbindir} +install -m 755 busybox.static $RPM_BUILD_ROOT/%{_sbindir}/busybox +install -m 755 busybox.petitboot $RPM_BUILD_ROOT/%{_sbindir}/busybox.petitboot mkdir -p $RPM_BUILD_ROOT/%{_mandir}/man1 install -m 644 docs/busybox.static.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1 install -m 644 docs/busybox.petitboot.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.petitboot.1 @@ -102,13 +104,13 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc LICENSE README -/sbin/busybox +%{_sbindir}/busybox %{_mandir}/man1/busybox.1.gz %files petitboot %defattr(-,root,root,-) %doc LICENSE README -/sbin/busybox.petitboot +%{_sbindir}/busybox.petitboot %{_mandir}/man1/busybox.petitboot.1.gz %changelog