rpms/udev/devel udev-089-nopie.patch,1.1,1.2 udev.spec,1.163,1.164

[fedora-cvs-commits at redhat.com]

Author: harald

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

Modified Files:
	udev-089-nopie.patch udev.spec 
Log Message:
correction for shlib

udev-089-nopie.patch:
 Makefile |    4 +++-
 1 files changed, 3 insertions(+), 1 deletion(-)

Index: udev-089-nopie.patch
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev-089-nopie.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- udev-089-nopie.patch	13 Apr 2006 08:46:43 -0000	1.1
+++ udev-089-nopie.patch	13 Apr 2006 09:48:33 -0000	1.2
@@ -1,11 +1,15 @@
---- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-12 15:03:07.000000000 +0200
-+++ udev-089/extras/volume_id/lib/Makefile	2006-04-12 15:03:19.000000000 +0200
-@@ -78,7 +78,7 @@
+--- udev-089/extras/volume_id/lib/Makefile.nopie	2006-04-03 14:41:10.000000000 +0200
++++ udev-089/extras/volume_id/lib/Makefile	2006-04-13 11:41:46.000000000 +0200
+@@ -76,9 +76,11 @@
+ 	$(E) "  RANLIB  " $@
+ 	$(Q) $(RANLIB) $@
  
++SHLIBFLAGS:=$(shell echo $(LDFLAGS)|sed -e 's/-pie//g')
++
  $(SHLIB): $(HEADERS) .shlib $(addprefix .shlib/,$(OBJS))
  	$(E) "  CC      " $@
 -	$(Q) $(CC) -shared $(CFLAGS) -o $@ \
-+	$(Q) $(LD) -shared -o $@ \
++	$(LD) $(SHLIBFLAGS) -shared -o $@ \
  		-Wl,-soname,libvolume_id.so.$(SHLIB_CUR),--version-script,exported_symbols \
  		$(addprefix .shlib/,$(OBJS))
  	$(Q) ln -sf $@ libvolume_id.so.$(SHLIB_CUR)


Index: udev.spec
===================================================================
RCS file: /cvs/dist/rpms/udev/devel/udev.spec,v
retrieving revision 1.163
retrieving revision 1.164
diff -u -r1.163 -r1.164
--- udev.spec	13 Apr 2006 08:46:43 -0000	1.163
+++ udev.spec	13 Apr 2006 09:48:34 -0000	1.164
@@ -19,7 +19,6 @@
 
 Patch1: udev-permconv.patch
 Patch2: udev-rules.patch
-#Patch3: udevstart2.patch
 Patch4: udev-084-floppy.patch
 Patch5: udev-extras.patch
 Patch6: udev-084-pg.patch
@@ -46,7 +45,6 @@
 %setup -q  
 %patch1 -p1 -b .rhpermconv
 %patch2 -p1 -b .rhrules
-#%patch3 -p1 -b .rhudevstart
 %patch4 -p1 -b .rhfloppy
 %patch5 -p1 -b .rhextras
 %patch6 -p1 -b .pg