rpms/pl/devel pl-5.4.6-rpath.patch,NONE,1.1 pl.spec,1.3,1.4

[Michael Schwendt (mschwendt)]

Author: mschwendt

Update of /cvs/extras/rpms/pl/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv8227

Modified Files:
	pl.spec 
Added Files:
	pl-5.4.6-rpath.patch 
Log Message:
Patch to fix standard/empty rpaths:

+ /usr/lib/rpm/check-rpaths /usr/lib/rpm/check-buildroot
ERROR: file '/usr/lib/pl-5.4.6/xpce-6.4.3/lib/i686-linux-gnu/pl2xpce.so' contains a standard rpath '/usr/lib' in [/usr/lib:]
ERROR: file '/usr/lib/pl-5.4.6/xpce-6.4.3/lib/i686-linux-gnu/pl2xpce.so' contains an empty rpath in [/usr/lib:]



pl-5.4.6-rpath.patch:

--- NEW FILE pl-5.4.6-rpath.patch ---
diff -Nur pl-5.4.6-orig/packages/xpce/pl/src/Makefile pl-5.4.6/packages/xpce/pl/src/Makefile
--- pl-5.4.6-orig/packages/xpce/pl/src/Makefile	2004-09-21 16:22:24.000000000 +0200
+++ pl-5.4.6/packages/xpce/pl/src/Makefile	2005-02-12 03:47:19.000000000 +0100
@@ -114,12 +114,8 @@
 		fi
 
 sopce$(XPCESO):
-		LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \
-		export LD_RUN_PATH; \
 		$(PLLD) -shared $(SOITF) $(LDFLAGS) -L$(XLIB) -L$(LIBDIR) -lXPCE -o $(XPCESO);
 axpce$(XPCESO):
-		LD_RUN_PATH="$(libdir):$$LD_RUN_PATH"; \
-		export LD_RUN_PATH; \
 		$(PLLD) -shared $(LDFLAGS) $(SOITF) $(SOEXTR) -L$(LIBDIR) \
 		-lXPCE $(GCCLIB) -L$(XLIB) $(XLIBS) $(NETLIBS) -o $(XPCESO);
 


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- pl.spec	12 Feb 2005 02:18:11 -0000	1.3
+++ pl.spec	12 Feb 2005 02:53:11 -0000	1.4
@@ -10,6 +10,7 @@
 Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.6.tar.gz
 Source1:	http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/refman/HTMLmanual.tar.gz
 Source2:	http://gollem.science.uva.nl/cgi-bin/nph-download/xpce/doc/userguide/userguide.html.tgz
+Patch0:		pl-5.4.6-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, unixODBC, openssl-devel
 
@@ -23,6 +24,7 @@
 
 %prep
 %setup -q
+%patch -p1 -b .rpath
 (
    mkdir doc-install
    cd doc-install