diff --git a/xfsdump.spec b/xfsdump.spec index 244d5a1..ca03cc8 100644 --- a/xfsdump.spec +++ b/xfsdump.spec @@ -12,6 +12,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libtool, gettext, gawk BuildRequires: xfsprogs-devel, libuuid-devel, libattr-devel ncurses-devel Requires: xfsprogs >= 2.6.30, attr >= 2.0.0 +Conflicts: filesystem < 3 %description The xfsdump package contains xfsdump, xfsrestore and a number of @@ -44,9 +45,8 @@ make DIST_ROOT=$RPM_BUILD_ROOT install # remove non-versioned docs location rm -rf $RPM_BUILD_ROOT/%{_datadir}/doc/xfsdump/ -(cd $RPM_BUILD_ROOT/%{_sbindir}; rm xfsdump xfsrestore) -(cd $RPM_BUILD_ROOT/%{_sbindir}; ln -s ../../sbin/xfsdump .) -(cd $RPM_BUILD_ROOT/%{_sbindir}; ln -s ../../sbin/xfsrestore .) +# move to /usr/sbin, /sbin is hard-coded +mv -f %{buildroot}/sbin/* %{buildroot}%{_sbindir}/ || : %clean rm -rf $RPM_BUILD_ROOT @@ -56,7 +56,6 @@ rm -rf $RPM_BUILD_ROOT %doc README doc/COPYING doc/CHANGES doc/README.xfsdump doc/xfsdump_ts.txt %{_mandir}/man8/* %{_sbindir}/* -/sbin/* %changelog * Mon Oct 17 2011 Eric Sandeen 3.0.6-1