rpms/libaio/devel libaio-install-to-slash.patch, NONE, 1.1 libaio.spec, 1.26, 1.27

[Jeffrey E. Moyer]

Author: jmoyer

Update of /cvs/pkgs/rpms/libaio/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2839

Modified Files:
	libaio.spec 
Added Files:
	libaio-install-to-slash.patch 
Log Message:
- Install to / instead of /usr for early users of libaio (Jeff Moyer)
- Resolves: bz#459158



libaio-install-to-slash.patch:

--- NEW FILE libaio-install-to-slash.patch ---
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
 


Index: libaio.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libaio/devel/libaio.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- libaio.spec	5 Aug 2008 20:46:16 -0000	1.26
+++ libaio.spec	3 Sep 2008 20:17:42 -0000	1.27
@@ -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 @@
 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 @@
 
 %prep
 %setup -a 0
+%patch1 -p1
 mv %{name}-%{version} compat-%{name}-%{version}
 
 %build
@@ -44,12 +50,10 @@
 [ "$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 @@
 
 %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 <jmoyer at redhat.com> - 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 <tcallawa at redhat.com> - 0.3.107-3
 - fix license tag