packages: libaio/libaio.spec, libaio/libaio-DESTDIR.patch (NEW) - add -DEST...

[glen]

Author: glen                         Date: Tue Oct 27 14:22:51 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add -DESTDIR.patch

---- Files affected:
packages/libaio:
   libaio.spec (1.8 -> 1.9) , libaio-DESTDIR.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/libaio/libaio.spec
diff -u packages/libaio/libaio.spec:1.8 packages/libaio/libaio.spec:1.9
--- packages/libaio/libaio.spec:1.8	Fri Jul 25 16:13:24 2008
+++ packages/libaio/libaio.spec	Tue Oct 27 15:22:45 2009
@@ -10,25 +10,29 @@
 Source0:	%{name}-%{version}.tar.gz
 # Source0-md5:	db32c19c61ca937bcb1ba48da9180682
 Patch0:		%{name}-arches.patch
+Patch1:		libaio-DESTDIR.patch
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 The Linux-native asynchronous I/O facility ("async I/O", or "aio") has
 a richer API and capability set than the simple POSIX async I/O
-facility. This library, libaio, provides the Linux-native API for
-async I/O. 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.
+facility.
+
+This library, libaio, provides the Linux-native API for async I/O. 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.
 
 %description -l pl.UTF-8
 Natywna dla Linuksa obsługa asynchronicznego wejścia/wyjścia ("async
 I/O" lub "aio") ma bogatsze API i zestaw możliwości niż proste
-asynchroniczne wejście/wyjście zgodne z POSIX. Ta biblioteka - libaio
-- udostępnia natywne Linuksowe API dla asynchronicznego we/wy. Zgodne
-z POSIX asynchroniczne we/wy wymaga tej biblioteki do udostępnienia
-przyspieszanych przez jądro możliwości asynchronicznego we/wy,
-podobnie jak aplikacje wymagające natywnego dla Linuksa API
-asynchronicznego we/wy.
+asynchroniczne wejście/wyjście zgodne z POSIX.
+
+Ta biblioteka - libaio - udostępnia natywne Linuksowe API dla
+asynchronicznego we/wy. Zgodne z POSIX asynchroniczne we/wy wymaga tej
+biblioteki do udostępnienia przyspieszanych przez jądro możliwości
+asynchronicznego we/wy, podobnie jak aplikacje wymagające natywnego
+dla Linuksa API asynchronicznego we/wy.
 
 %package devel
 Summary:	Header files for libaio library
@@ -57,6 +61,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__make} \
@@ -68,16 +73,15 @@
 install -d $RPM_BUILD_ROOT/%{_lib}
 
 %{__make} install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	libdir=$RPM_BUILD_ROOT%{_libdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 # omit some manuals:
 # man2/io_* already included in man-pages
 # some man3/aio_* already included in glibc-devel-doc (from man-pages)
 install -d $RPM_BUILD_ROOT%{_mandir}/man3
-install man/aio{,_cancel64,_error64,_fsync64,_init,_read64,_return64,_suspend64,_write64}.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install man/io*.3 $RPM_BUILD_ROOT%{_mandir}/man3
-install man/lio*.3 $RPM_BUILD_ROOT%{_mandir}/man3
+cp -a man/aio{,_cancel64,_error64,_fsync64,_init,_read64,_return64,_suspend64,_write64}.3 $RPM_BUILD_ROOT%{_mandir}/man3
+cp -a man/io*.3 $RPM_BUILD_ROOT%{_mandir}/man3
+cp -a man/lio*.3 $RPM_BUILD_ROOT%{_mandir}/man3
 
 # move to /%{_lib}, for multipath-tools
 mv -f $RPM_BUILD_ROOT%{_libdir}/libaio.so.* $RPM_BUILD_ROOT/%{_lib}
@@ -113,6 +117,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.9  2009/10/27 14:22:45  glen
+- add -DESTDIR.patch
+
 Revision 1.8  2008/07/25 14:13:24  glen
 - uploaded tarball to df
 

================================================================
Index: packages/libaio/libaio-DESTDIR.patch
diff -u /dev/null packages/libaio/libaio-DESTDIR.patch:1.1
--- /dev/null	Tue Oct 27 15:22:51 2009
+++ packages/libaio/libaio-DESTDIR.patch	Tue Oct 27 15:22:45 2009
@@ -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	2009-01-20 10:07:31.520105235 -0500
++++ libaio-0.3.107/src/Makefile	2009-01-20 10:08:51.199104930 -0500
+@@ -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)$(libdir)/$(soname)
++	ln -sf $(libdir)/$(libname) $(DESTDIR)$(usrlibdir)/libaio.so
+ 
+ $(libaio_objs): libaio.h
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libaio/libaio.spec?r1=1.8&r2=1.9&f=u