rpms/udev/devel udev-091-lib64.patch, NONE, 1.1 udev.spec, 1.167, 1.168

[fedora-cvs-commits at redhat.com]

Author: harald

Update of /cvs/dist/rpms/udev/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv28152

Modified Files:
	udev.spec 
Added Files:
	udev-091-lib64.patch 
Log Message:
patched for lib64

udev-091-lib64.patch:
 Makefile                      |    4 ++++
 extras/volume_id/Makefile     |    8 +++++++-
 extras/volume_id/lib/Makefile |    6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

--- NEW FILE udev-091-lib64.patch ---
--- udev-091/Makefile.lib64	2006-04-25 22:39:59.000000000 +0200
+++ udev-091/Makefile	2006-05-03 18:16:31.000000000 +0200
@@ -103,6 +103,8 @@
 libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev
+libdir ?= 	${prefix}/lib
+usrlibdir ?= 	${prefix}/usr/lib
 udevdir =	/dev
 DESTDIR =
 
@@ -179,6 +181,8 @@
 			RANLIB="$(RANLIB)" \
 			LIB_OBJS="$(LIB_OBJS)" \
 			LIBUDEV="$(PWD)/$(LIBUDEV)" \
+			libdir=$(libdir) \
+			usrlibdir=$(usrlibdir) \
 			-C $$target $@ || exit 1; \
 	done;
 .PHONY: all
--- udev-091/extras/volume_id/lib/Makefile.lib64	2006-05-03 18:15:28.000000000 +0200
+++ udev-091/extras/volume_id/lib/Makefile	2006-05-03 18:15:53.000000000 +0200
@@ -4,9 +4,9 @@
 #
 # Released under the GNU General Public License, version 2.
 #
-includedir = 	${prefix}/usr/include
-libdir =	${prefix}/lib
-usrlibdir =	${prefix}/usr/lib
+includedir ?= 	${prefix}/usr/include
+libdir ?=	${prefix}/lib
+usrlibdir ?=	${prefix}/usr/lib
 
 INSTALL = /usr/bin/install -c
 INSTALL_DATA  = ${INSTALL} -m 644
--- udev-091/extras/volume_id/Makefile.lib64	2006-04-25 22:39:59.000000000 +0200
+++ udev-091/extras/volume_id/Makefile	2006-05-03 18:16:14.000000000 +0200
@@ -17,6 +17,9 @@
 libudevdir =	${prefix}/lib/udev
 mandir =	${prefix}/usr/share/man
 configdir =	${etcdir}/udev/
+libdir ?=       ${prefix}/lib
+usrlibdir ?=    ${prefix}/usr/lib
+
 
 INSTALL = /usr/bin/install -c
 INSTALL_PROGRAM = ${INSTALL}
@@ -32,7 +35,10 @@
 	$(Q) $(CC) -c $(CFLAGS) $< -o $@
 
 lib/libvolume_id.a:
-	$(Q) $(MAKE) -C lib
+	$(Q) $(MAKE) \
+		libdir=$(libdir) \
+		usrlibdir=$(usrlibdir) \
+		-C lib
 
 $(PROG): %: $(HEADERS) %.o lib/libvolume_id.a
 	$(E) "  LD      " $@


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -r1.167 -r1.168
--- udev.spec	3 May 2006 15:54:21 -0000	1.167
+++ udev.spec	3 May 2006 16:19:56 -0000	1.168
@@ -24,6 +24,7 @@
 Patch6: udev-084-pg.patch
 Patch7: udev-089-nopie.patch
 Patch8: udev-089-last_modalias.patch
+Patch9: udev-091-lib64.patch
 
 ExclusiveOS: Linux
 URL: http://kernel.org/pub/linux/utils/kernel/hotplug/
@@ -67,6 +68,7 @@
 %patch6 -p1 -b .pg
 %patch7 -p1 -b .nopie
 %patch8 -p1 -b .last_modalias
+%patch9 -p1 -b .lib64
 
 %build
 
@@ -142,6 +144,8 @@
 touch extras/volume_id/vol_id
 
 make DESTDIR=$RPM_BUILD_ROOT CC="gcc $RPM_OPT_FLAGS -fpie -pie" LDFLAGS="-pie" install \
+	libdir="/%{_lib}" \
+	usrlibdir="%{_libdir}" \
 	EXTRAS="	\
 	extras/scsi_id	\
         extras/ata_id \