diff --git a/libaio.spec b/libaio.spec index e48c568..f79d536 100644 --- a/libaio.spec +++ b/libaio.spec @@ -8,6 +8,7 @@ Source: ftp://ftp.kernel.org/pub/linux/libs/aio/%{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root Patch1: libaio-install-to-slash.patch Patch2: libaio-sparc.patch +Conflicts: filesystem < 3 %description The Linux-native asynchronous I/O facility ("async I/O", or "aio") has a @@ -17,9 +18,6 @@ The POSIX async I/O facility requires this library in order to provide kernel-accelerated async I/O capabilities, as do applications which require the Linux-native async I/O API. -%define libdir /%{_lib} -%define usrlibdir %{_prefix}/%{_lib} - %package devel Summary: Development files for Linux-native asynchronous I/O access Group: Development/System @@ -49,9 +47,9 @@ make [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT cd compat-%{name}-%{version} install -D -m 755 src/libaio.so.1.0.0 \ - $RPM_BUILD_ROOT/%{libdir}/libaio.so.1.0.0 + $RPM_BUILD_ROOT/%{_libdir}/libaio.so.1.0.0 cd .. -make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ +make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{_libdir} usrlibdir=%{_libdir} \ includedir=%{_includedir} install %clean @@ -63,13 +61,13 @@ make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ %files %defattr(-,root,root) -%attr(0755,root,root) %{libdir}/libaio.so.* +%attr(0755,root,root) %{_libdir}/libaio.so.* %doc COPYING TODO %files devel %defattr(-,root,root) %attr(0644,root,root) %{_includedir}/* -%attr(0755,root,root) %{usrlibdir}/libaio.so* +%attr(0755,root,root) %{_libdir}/libaio.so %exclude %{_libdir}/libaio.a %changelog