devel/pl pl-rpath.patch,NONE,1.1 pl.spec,1.4,1.5

[Gérard Milmeister (gemi)]

Author: gemi

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

Modified Files:
	pl.spec 
Added Files:
	pl-rpath.patch 
Log Message:
Removed rpath from shared libs


pl-rpath.patch:

--- NEW FILE pl-rpath.patch ---
--- pl-5.4.6/packages/xpce/pl/src/Makefile.rpath	2005-02-12 13:07:47.848134824 +0100
+++ pl-5.4.6/packages/xpce/pl/src/Makefile	2005-02-12 13:08:37.659161327 +0100
@@ -114,12 +114,9 @@
 		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/devel/pl/pl.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- pl.spec	12 Feb 2005 02:53:11 -0000	1.4
+++ pl.spec	12 Feb 2005 12:19:45 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.4.6
-Release:	1
+Release:	2
 Epoch:		0
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
@@ -10,9 +10,10 @@
 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
+Patch:		pl-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, unixODBC, openssl-devel
+BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:  unixODBC, unixODBC-devel
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -24,7 +25,7 @@
 
 %prep
 %setup -q
-%patch -p1 -b .rpath
+%patch -p1
 (
    mkdir doc-install
    cd doc-install
@@ -73,6 +74,10 @@
 %{_bindir}/*
 
 %changelog
+* Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:5.4.6-2
+- Added BuildRequires: unixODBC, unixODBC-devel
+- Removed rpath from shared libs: pl-rpath.patch
+
 * Sat Feb 12 2005 Gerard Milmeister <gemi at bluewin.ch> - 0:5.4.6-1
 - New Version 5.4.6