diff --git a/btrfs-progs.spec b/btrfs-progs.spec index a477a51..e7300f6 100644 --- a/btrfs-progs.spec +++ b/btrfs-progs.spec @@ -15,8 +15,7 @@ Patch4: btrfs-progs-build-fixes.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: e2fsprogs-devel, libuuid-devel, zlib-devel, libacl-devel - -%define _root_sbindir /sbin +Conflicts: filesystem < 3 %description The btrfs-progs package provides all the userpsace programs needed to create, @@ -36,7 +35,7 @@ make CFLAGS="$RPM_OPT_FLAGS" %{?_smp_mflags} LDFLAGS="-lcom_err" convert %install rm -rf $RPM_BUILD_ROOT -make mandir=%{_mandir} bindir=%{_root_sbindir} install DESTDIR=$RPM_BUILD_ROOT +make mandir=%{_mandir} bindir=%{_sbindir} install DESTDIR=$RPM_BUILD_ROOT %clean rm -rf $RPM_BUILD_ROOT @@ -44,18 +43,18 @@ rm -rf $RPM_BUILD_ROOT %files %defattr(-,root,root,-) %doc COPYING INSTALL -%{_root_sbindir}/btrfsctl -%{_root_sbindir}/btrfsck -%{_root_sbindir}/mkfs.btrfs -%{_root_sbindir}/btrfs-debug-tree -%{_root_sbindir}/btrfs-image -%{_root_sbindir}/btrfs-show -%{_root_sbindir}/btrfs-vol -%{_root_sbindir}/btrfs-convert -%{_root_sbindir}/btrfstune -%{_root_sbindir}/btrfs -%{_root_sbindir}/btrfs-map-logical -%{_root_sbindir}/btrfs-zero-log +%{_sbindir}/btrfsctl +%{_sbindir}/btrfsck +%{_sbindir}/mkfs.btrfs +%{_sbindir}/btrfs-debug-tree +%{_sbindir}/btrfs-image +%{_sbindir}/btrfs-show +%{_sbindir}/btrfs-vol +%{_sbindir}/btrfs-convert +%{_sbindir}/btrfstune +%{_sbindir}/btrfs +%{_sbindir}/btrfs-map-logical +%{_sbindir}/btrfs-zero-log %{_mandir}/man8/btrfs-image.8.gz %{_mandir}/man8/btrfs-show.8.gz %{_mandir}/man8/btrfsck.8.gz