diff --git a/rstp.spec b/rstp.spec index 774fcce..ea129f5 100644 --- a/rstp.spec +++ b/rstp.spec @@ -8,6 +8,7 @@ Release: 6%{dist} License: GPLv2+ and LGPLv2+ Group: System Environment/Base +Conflicts: filesystem < 3 # Generate this tarball with the following commands in the git tree: # git clone git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/rstp.git # cd rstp @@ -36,12 +37,18 @@ make %{?_smp_mflags} %install make INSTALLPREFIX=$RPM_BUILD_ROOT install -install -m 755 bridge $RPM_BUILD_ROOT/sbin -install -m 755 bridge-stp $RPM_BUILD_ROOT/sbin +mkdir -p %{buildroot}%{_sbindir} + +install -m 755 bridge %{buildroot}%{_sbindir}/ +install -m 755 bridge-stp %{buildroot}%{_sbindir}/ + +# move stuff to /usr/sbin, the hard-coded /sbin is just a symlink +mv -f %{buildroot}/sbin/rstpd %{buildroot}%{_sbindir}/ || : +mv -f %{buildroot}/sbin/rstpctl %{buildroot}%{_sbindir}/ || : %files %defattr(-,root,root,-) -/sbin/* +%{_sbindir}/* %{_mandir}/man8/* %doc CHANGES_TO_RSTPLIB TODO LICENSE rstplib/COPYING