rpms/pl/FC-4 pl-5.6.0-multilib.patch, NONE, 1.1 .cvsignore, 1.4, 1.5 pl.spec, 1.16, 1.17 sources, 1.4, 1.5

[Gérard Milmeister (gemi)]

Author: gemi

Update of /cvs/extras/rpms/pl/FC-4
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv21025

Modified Files:
	.cvsignore pl.spec sources 
Added Files:
	pl-5.6.0-multilib.patch 
Log Message:
new version 5.6.0

pl-5.6.0-multilib.patch:

--- NEW FILE pl-5.6.0-multilib.patch ---
--- pl-5.6.0/src/rc/Makefile.in.multilib	2006-01-02 22:43:19.000000000 +0100
+++ pl-5.6.0/src/rc/Makefile.in	2006-01-02 22:43:46.000000000 +0100
@@ -18,7 +18,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=$(exec_prefix)/bin
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 man_prefix=$(prefix)/man
 mansec=1
 lmansec=3
--- pl-5.6.0/src/configure.multilib	2006-01-02 22:41:36.000000000 +0100
+++ pl-5.6.0/src/configure	2006-01-02 22:41:59.000000000 +0100
@@ -2546,7 +2546,7 @@
 
 
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
-PLBASE=$prefix/lib/$PL-$PLVERSION
+PLBASE=$libdir/$PL-$PLVERSION
 
 
 for ac_prog in gmake make
--- pl-5.6.0/src/Makefile.in.multilib	2006-01-02 22:42:12.000000000 +0100
+++ pl-5.6.0/src/Makefile.in	2006-01-02 22:42:46.000000000 +0100
@@ -46,7 +46,8 @@
 PLVERSION=@PLVERSION@
 PL=@PL@@RT@
 PLV=@PL@@RT at -@PLVERSION@
-PLBASE=$(prefix)/lib/@PL@@RT at -@PLVERSION@
+libdir=@libdir@
+PLBASE=$(libdir)/@PL@@RT at -@PLVERSION@
 BOOTFILE=@BOOTFILE@
 
 CC=@CC@
--- pl-5.6.0/packages/Makefile.in.multilib	2006-01-02 22:39:53.000000000 +0100
+++ pl-5.6.0/packages/Makefile.in	2006-01-02 22:41:19.000000000 +0100
@@ -30,7 +30,8 @@
 bindir=@bindir@
 PL=@PL@@RT@
 PLVERSION=@PLVERSION@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 PKGDOC=$(PLBASE)/doc/packages
 PLLIBS=@LIBS@
 PLARCH=@ARCH@


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- .cvsignore	22 Jun 2005 19:47:37 -0000	1.4
+++ .cvsignore	2 Jan 2006 22:10:54 -0000	1.5
@@ -1,3 +1,3 @@
-pl-5.4.7.tar.gz
 HTMLmanual.tar.gz
+pl-5.6.0.tar.gz
 userguide.html.tgz


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/pl.spec,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- pl.spec	22 Jun 2005 19:47:37 -0000	1.16
+++ pl.spec	2 Jan 2006 22:10:54 -0000	1.17
@@ -1,5 +1,5 @@
 Name:		pl
-Version:	5.4.7
+Version:	5.6.0
 Release:	1%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
@@ -7,19 +7,18 @@
 Group:		Development/Languages
 License:	LGPL
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.4.7.tar.gz
+Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.0.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
-Patch1:		pl-5.4.6-multilib.patch
-Patch2:		pl-5.4.6-visibilityabuse.patch
-Patch3:		pl-5.4.7-gcc4fix.patch
+Patch0:         pl-5.4.6-rpath.patch
+Patch1:         pl-5.6.0-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
+BuildRequires:	libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
+BuildRequires:  xorg-x11-devel
 
 # x86_64 excluded due to build failure: https://bugzilla.redhat.com/149038
-ExcludeArch: x86_64
+#ExcludeArch: x86_64
 
 %description
 ISO/Edinburgh-style Prolog compiler including modules, autoload,
@@ -29,12 +28,11 @@
 XML/SGML), sgml/RDF (reading RDF into triples) and XPCE (Graphics UI
 toolkit, integrated editor (Emacs-clone) and source-level debugger).
 
+
 %prep
 %setup -q
 %patch0 -p1 -b .rpath
 %patch1 -p1 -b .multilib
-%patch2 -p1 -b .visibilityabuse
-%patch3 -p1 -b .gcc4fix
 (
    mkdir doc-install
    cd doc-install
@@ -42,6 +40,7 @@
    tar zxf %{SOURCE2}
 )
 
+
 %build
 %configure
 make COFLAGS="$RPM_OPT_FLAGS"
@@ -51,6 +50,7 @@
 make COFLAGS="$RPM_OPT_FLAGS"
 cd ..
 
+
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
@@ -67,9 +67,11 @@
 rm -rf $RPM_BUILD_ROOT%{_libdir}/pl-%{version}/man
 rm -fr $RPM_BUILD_ROOT%{_mandir}/man3/readline*
 
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog README COPYING ANNOUNCE VERSION
@@ -79,9 +81,13 @@
 %{_libdir}/pl*
 %{_bindir}/*
 
+
 %changelog
+* Mon Jan  2 2006 Gerard Milmeister <gemi at bluewin.ch> - 5.6.0-1
+- new version 5.6.0
+
 * Wed Jun 22 2005 Gerard Milmeister <gemi at bluewin.ch> - 5.4.7-1
-- New Version 5.4.7
+- new version 5.4.7
 
 * Sun May 22 2005 Jeremy Katz <katzj at redhat.com> - 5.4.6-9
 - rebuild on all arches


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/pl/FC-4/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- sources	22 Jun 2005 19:47:37 -0000	1.4
+++ sources	2 Jan 2006 22:10:54 -0000	1.5
@@ -1,3 +1,3 @@
-5c57c9a752bd3c6f56e4ae506ab23726  pl-5.4.7.tar.gz
-e93a7d6ed002750f38dd3ae83f6e0fa8  HTMLmanual.tar.gz
-fbe3c4102f897fbfcadeb1cc94603dfa  userguide.html.tgz
+6ffc2ce035b0534f822757472d734237  HTMLmanual.tar.gz
+ffc656404053b29f34a249fcd44b3807  pl-5.6.0.tar.gz
+72feb8797f134c45be719133873cae1f  userguide.html.tgz