diff --git a/libaio-install-to-slash.patch b/libaio-install-to-slash.patch new file mode 100644 index 0000000..f0a4fa2 --- /dev/null +++ b/libaio-install-to-slash.patch @@ -0,0 +1,30 @@ +diff -up libaio-0.3.107/src/Makefile.orig libaio-0.3.107/src/Makefile +--- libaio-0.3.107/src/Makefile.orig 2008-09-03 15:57:48.233332354 -0400 ++++ libaio-0.3.107/src/Makefile 2008-09-03 15:58:23.591332705 -0400 +@@ -1,6 +1,7 @@ + prefix=/usr +-includedir=$(prefix)/include +-libdir=$(prefix)/lib ++includedir=/usr/include ++libdir=/usr/lib ++usrlibdir=/usr/lib + + ARCH := $(shell uname -m | sed -e s/i.86/i386/) + CFLAGS := -nostdlib -nostartfiles -Wall -I. -g -fomit-frame-pointer -O2 -fPIC +@@ -51,11 +52,11 @@ $(libname): $(libaio_sobjs) libaio.map + $(CC) $(SO_CFLAGS) -Wl,--version-script=libaio.map -Wl,-soname=$(soname) -o $@ $(libaio_sobjs) $(LINK_FLAGS) + + install: $(all_targets) +- install -D -m 644 libaio.h $(includedir)/libaio.h +- install -D -m 644 libaio.a $(libdir)/libaio.a +- install -D -m 755 $(libname) $(libdir)/$(libname) +- ln -sf $(libname) $(libdir)/$(soname) +- ln -sf $(libname) $(libdir)/libaio.so ++ install -D -m 644 libaio.h $(destdir)$(includedir)/libaio.h ++ install -D -m 644 libaio.a $(destdir)$(usrlibdir)/libaio.a ++ install -D -m 755 $(libname) $(destdir)$(libdir)/$(libname) ++ ln -sf $(libdir)/$(libname) $(destdir)$(usrlibdir)/$(soname) ++ ln -sf $(libdir)/$(libname) $(destdir)$(usrlibdir)/libaio.so + + $(libaio_objs): libaio.h + diff --git a/libaio.spec b/libaio.spec index d9e4d82..53a7a9f 100644 --- a/libaio.spec +++ b/libaio.spec @@ -1,11 +1,13 @@ Name: libaio Version: 0.3.107 -Release: 3%{?dist} +Release: 4%{?dist} Summary: Linux-native asynchronous I/O access library License: LGPLv2+ Group: System Environment/Libraries Source: %{name}-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-root +Patch1: libaio-install-to-slash.patch + # Fix ExclusiveArch as we implement this functionality on more architectures ExclusiveArch: i386 x86_64 ia64 s390 s390x ppc ppc64 ppc64pseries ppc64iseries alpha alphaev6 @@ -17,6 +19,9 @@ 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 @@ -28,6 +33,7 @@ for the Linux-native asynchronous I/O facility ("async I/O", or "aio"). %prep %setup -a 0 +%patch1 -p1 mv %{name}-%{version} compat-%{name}-%{version} %build @@ -44,12 +50,10 @@ 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 install prefix=$RPM_BUILD_ROOT/usr \ - libdir=$RPM_BUILD_ROOT/%{_libdir} \ - root=$RPM_BUILD_ROOT - +make destdir=$RPM_BUILD_ROOT prefix=/ libdir=%{libdir} usrlibdir=%{usrlibdir} \ + includedir=%{_includedir} install %clean [ "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT @@ -60,16 +64,20 @@ make install prefix=$RPM_BUILD_ROOT/usr \ %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) %{_libdir}/libaio.so +%attr(0755,root,root) %{usrlibdir}/libaio.so* %attr(0644,root,root) %{_libdir}/libaio.a %changelog +* Wed Sep 3 2008 Jeff Moyer - 0.3.107-4 +- Install to / instead of /usr for early users of libaio (Jeff Moyer) +- Resolves: bz#459158 + * Tue Aug 5 2008 Tom "spot" Callaway - 0.3.107-3 - fix license tag