diff --git a/e2fsprogs.spec b/e2fsprogs.spec index 10d8deb..6f466af 100644 --- a/e2fsprogs.spec +++ b/e2fsprogs.spec @@ -1,6 +1,3 @@ -%define _root_sbindir /sbin -%define _root_libdir /%{_lib} - Summary: Utilities for managing ext2, ext3, and ext4 filesystems Name: e2fsprogs Version: 1.42 @@ -20,6 +17,11 @@ Patch2: e2fsprogs-1.42-bigendian-fix.patch Url: http://e2fsprogs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: e2fsprogs-libs = %{version}-%{release} +Conflicts: filesystem < 3 +Provides: /sbin/fsck.ext2 +Provides: /sbin/fsck.ext3 +Provides: /sbin/fsck.ext4 +Provides: /sbin/mke2fs # e4fsprogs was a parallel ext4-capable package in RHEL5.x %if 0%{?rhel} > 0 @@ -52,6 +54,7 @@ performance of an ext2, ext3, or ext4 filesystem. Summary: Ext2/3/4 filesystem-specific shared libraries Group: Development/Libraries License: GPLv2 and LGPLv2 +Conflicts: filesystem < 3 %description libs E2fsprogs-libs contains libe2p and libext2fs, the libraries of the @@ -64,6 +67,7 @@ from userspace. Summary: Ext2/3/4 filesystem-specific static libraries Group: Development/Libraries License: GPLv2 and LGPLv2 +Conflicts: filesystem < 3 %description static E2fsprogs-static contains all static libraries built from e2fsprogs, @@ -96,6 +100,7 @@ also want to install e2fsprogs. Summary: Common error description library Group: Development/Libraries License: MIT +Conflicts: filesystem < 3 %description -n libcom_err This is the common error description library, part of e2fsprogs. @@ -121,6 +126,7 @@ libcom_err is an attempt to present a common error-handling mechanism. Summary: Command line interface parsing library Group: Development/Libraries License: MIT +Conflicts: filesystem < 3 %description -n libss This is libss, a command line interface parsing library, part of e2fsprogs. @@ -162,8 +168,7 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} export PATH=/sbin:$PATH -make install install-libs DESTDIR=%{buildroot} INSTALL="%{__install} -p" \ - root_sbindir=%{_root_sbindir} root_libdir=%{_root_libdir} +make install install-libs DESTDIR=%{buildroot} INSTALL="%{__install} -p" # ugly hack to allow parallel install of 32-bit and 64-bit -devel packages: %define multilib_arches %{ix86} x86_64 ppc ppc64 s390 s390x sparcv9 sparc64 @@ -211,25 +216,25 @@ exit 0 %doc COPYING README RELEASE-NOTES %config(noreplace) /etc/mke2fs.conf -%{_root_sbindir}/badblocks -%{_root_sbindir}/debugfs -%{_root_sbindir}/dumpe2fs -%{_root_sbindir}/e2fsck -%{_root_sbindir}/e2image -%{_root_sbindir}/e2label -%{_root_sbindir}/e2undo -%{_root_sbindir}/fsck.ext2 -%{_root_sbindir}/fsck.ext3 -%{_root_sbindir}/fsck.ext4 -%{_root_sbindir}/fsck.ext4dev -%{_root_sbindir}/logsave -%{_root_sbindir}/mke2fs -%{_root_sbindir}/mkfs.ext2 -%{_root_sbindir}/mkfs.ext3 -%{_root_sbindir}/mkfs.ext4 -%{_root_sbindir}/mkfs.ext4dev -%{_root_sbindir}/resize2fs -%{_root_sbindir}/tune2fs +%{_sbindir}/badblocks +%{_sbindir}/debugfs +%{_sbindir}/dumpe2fs +%{_sbindir}/e2fsck +%{_sbindir}/e2image +%{_sbindir}/e2label +%{_sbindir}/e2undo +%{_sbindir}/fsck.ext2 +%{_sbindir}/fsck.ext3 +%{_sbindir}/fsck.ext4 +%{_sbindir}/fsck.ext4dev +%{_sbindir}/logsave +%{_sbindir}/mke2fs +%{_sbindir}/mkfs.ext2 +%{_sbindir}/mkfs.ext3 +%{_sbindir}/mkfs.ext4 +%{_sbindir}/mkfs.ext4dev +%{_sbindir}/resize2fs +%{_sbindir}/tune2fs %{_sbindir}/filefrag %{_sbindir}/e2freefrag %{_sbindir}/e4defrag @@ -270,8 +275,8 @@ exit 0 %files libs %defattr(-,root,root) %doc COPYING -%{_root_libdir}/libe2p.so.* -%{_root_libdir}/libext2fs.so.* +%{_libdir}/libe2p.so.* +%{_libdir}/libext2fs.so.* %files static %defattr(-,root,root) @@ -294,7 +299,7 @@ exit 0 %files -n libcom_err %defattr(-,root,root) %doc COPYING -%{_root_libdir}/libcom_err.so.* +%{_libdir}/libcom_err.so.* %files -n libcom_err-devel %defattr(-,root,root) @@ -310,7 +315,7 @@ exit 0 %files -n libss %defattr(-,root,root) %doc COPYING -%{_root_libdir}/libss.so.* +%{_libdir}/libss.so.* %files -n libss-devel %defattr(-,root,root)