rpms/pl/devel pl-5.4.6-multilib.patch,NONE,1.1 pl.spec,1.8,1.9

[Michael Schwendt (mschwendt)]

Author: mschwendt

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

Modified Files:
	pl.spec 
Added Files:
	pl-5.4.6-multilib.patch 
Log Message:
Some changes on the road to getting this to build on x86_64 (bug #149038).

pl-5.4.6-multilib.patch:

--- NEW FILE pl-5.4.6-multilib.patch ---
diff -Nur pl-5.4.6-orig/packages/Makefile.in pl-5.4.6/packages/Makefile.in
--- pl-5.4.6-orig/packages/Makefile.in	2004-09-21 16:22:23.000000000 +0200
+++ pl-5.4.6/packages/Makefile.in	2005-02-20 19:17:29.177912840 +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@
diff -Nur pl-5.4.6-orig/src/configure pl-5.4.6/src/configure
--- pl-5.4.6-orig/src/configure	2004-09-23 17:07:16.000000000 +0200
+++ pl-5.4.6/src/configure	2005-02-20 19:11:15.839218064 +0100
@@ -1308,7 +1308,7 @@
 MKLIBS=staticlib
 RT=""
 PLVERSION=`cat ../VERSION`
-PLBASE="$prefix/lib/$PL-$PLVERSION"
+PLBASE="$libdir/$PL-$PLVERSION"
 CNFG=""
 
 true()
diff -Nur pl-5.4.6-orig/src/Makefile.in pl-5.4.6/src/Makefile.in
--- pl-5.4.6-orig/src/Makefile.in	2004-09-30 12:00:50.000000000 +0200
+++ pl-5.4.6/src/Makefile.in	2005-02-20 19:16:56.252918200 +0100
@@ -40,7 +40,8 @@
 srcdir=@srcdir@
 @VPATH@ @srcdir@
 bindir=@bindir@
-PLBASE=$(prefix)/lib/@PL at -$(PLVERSION)
+libdir=@libdir@
+PLBASE=$(libdir)/@PL at -$(PLVERSION)
 # NOTE: Also defined in config.h!
 BOOTFILE=@BOOTFILE@
 mandir=@mandir@
diff -Nur pl-5.4.6-orig/src/rc/Makefile.in pl-5.4.6/src/rc/Makefile.in
--- pl-5.4.6-orig/src/rc/Makefile.in	1999-09-14 13:10:54.000000000 +0200
+++ pl-5.4.6/src/rc/Makefile.in	2005-02-20 19:18:05.517388400 +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


Index: pl.spec
===================================================================
RCS file: /cvs/extras/rpms/pl/devel/pl.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- pl.spec	20 Feb 2005 20:25:57 -0000	1.8
+++ pl.spec	20 Feb 2005 20:29:03 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		pl
 Version:	5.4.6
-Release:	4
+Release:	5
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
@@ -10,6 +10,7 @@
 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-5.4.6-rpath.patch
+Patch1:		pl-5.4.6-multilib.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	xorg-x11-devel, libjpeg-devel, readline-devel, openssl-devel
 BuildRequires:  unixODBC-devel
@@ -25,6 +26,7 @@
 %prep
 %setup -q
 %patch -p1
+%patch1 -p1 -b .multilib
 (
    mkdir doc-install
    cd doc-install
@@ -44,15 +46,13 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_prefix}
-make install \
-	prefix=$RPM_BUILD_ROOT%{_prefix} \
-	bindir=$RPM_BUILD_ROOT%{_bindir} \
-	mandir=$RPM_BUILD_ROOT%{_mandir}
+%makeinstall
 (cd packages && \
  PATH=$RPM_BUILD_ROOT/usr/bin:$PATH make rpm-install \
 	PLBASE=$RPM_BUILD_ROOT%{_libdir}/pl-%{version} \
 	prefix=$RPM_BUILD_ROOT%{_prefix} \
         bindir=$RPM_BUILD_ROOT%{_bindir} \
+        libdir=$RPM_BUILD_ROOT%{_libdir} \
 	mandir=$RPM_BUILD_ROOT%{_mandir}/man1
 )
 
@@ -72,6 +72,10 @@
 %{_bindir}/*
 
 %changelog
+* Sun Feb 20 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 5.4.6-5
+- Added patch1 for a few multilib Makefile/configure fixes.
+- Use %%makeinstall and set libdir in install section.
+
 * Sat Feb 12 2005 Warren Togami <wtogami at redhat.com> - 5.4.6-4
 - remove duplicate RPATH patch
 - remove Epoch