From bfc23f7fbbdd55ba4407113a8142da387b1dab96 Mon Sep 17 00:00:00 2001 From: Warren Togami Date: Feb 12 2005 19:25:28 +0000 Subject: - remove duplicate RPATH patch - remove Epoch --- diff --git a/pl-rpath.patch b/pl-rpath.patch deleted file mode 100644 index 477729c..0000000 --- a/pl-rpath.patch +++ /dev/null @@ -1,16 +0,0 @@ ---- 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); - diff --git a/pl.spec b/pl.spec index 7cc0968..15c35d6 100644 --- a/pl.spec +++ b/pl.spec @@ -1,7 +1,6 @@ Name: pl Version: 5.4.6 -Release: 2 -Epoch: 0 +Release: 3 Summary: SWI-Prolog - Edinburgh compatible Prolog compiler Group: Development/Languages @@ -10,7 +9,7 @@ URL: http://www.swi-prolog.org 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 -Patch: pl-rpath.patch +Patch: pl-5.4.6-rpath.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel BuildRequires: unixODBC, unixODBC-devel @@ -74,12 +73,16 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/* %changelog -* Sat Feb 12 2005 Gerard Milmeister - 0:5.4.6-2 +* Sat Feb 12 2005 Warren Togami - 5.4.6-3 +- remove duplicate RPATH patch +- remove Epoch + +* Sat Feb 12 2005 Gerard Milmeister - 5.4.6-2 - Added BuildRequires: unixODBC, unixODBC-devel - Removed rpath from shared libs: pl-rpath.patch -* Sat Feb 12 2005 Gerard Milmeister - 0:5.4.6-1 +* Sat Feb 12 2005 Gerard Milmeister - 5.4.6-1 - New Version 5.4.6 -* Thu Jan 13 2005 Gerard Milmeister - 0:5.4.5-0.fdr.1 +* Thu Jan 13 2005 Gerard Milmeister - 5.4.5-0.fdr.1 - New Version 5.4.5