rpms/pl/F-10 pl.spec, 1.55, 1.56 pl-5.6.0-multilib.patch, 1.1, NONE pl-5.6.52-jni.patch, 1.1, NONE pl-5.6.55-configure.patch, 1.1, NONE pl-5.6.57-locale.patch, 1.1, NONE

[mef]

Author: mef

Update of /cvs/pkgs/rpms/pl/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18715

Modified Files:
	pl.spec 
Removed Files:
	pl-5.6.0-multilib.patch pl-5.6.52-jni.patch 
	pl-5.6.55-configure.patch pl-5.6.57-locale.patch 
Log Message:
Fix multilib issues; remove redundant patches


Index: pl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pl/F-10/pl.spec,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -p -r1.55 -r1.56
--- pl.spec	2 Mar 2009 14:36:39 -0000	1.55
+++ pl.spec	6 Jul 2009 11:21:43 -0000	1.56
@@ -2,21 +2,22 @@
 %define jdkverlong %{jdkvershort}.0
 
 Name:		pl
-Version:	5.6.60
-Release:	4%{?dist}
+Version:	5.6.64
+Release:	2%{?dist}
 
 Summary:	SWI-Prolog - Edinburgh compatible Prolog compiler
 
 Group:		Development/Languages
 License:	LGPLv2+
 URL:		http://www.swi-prolog.org
-Source:		http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/%{name}-%{version}.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
+Source:		http://www.swi-prolog.org/download/stable/src/%{name}-%{version}.tar.gz
+Source1:	http://www.swi-prolog.org/download/stable/doc/SWI-Prolog-5.6.59.pdf
+Source2:	http://www.swi-prolog.org/download/xpce/doc/userguide/userguide.html.tgz
 Patch0:         %{name}-5.4.6-rpath.patch
 Patch1:         %{name}-5.6.57-jpl-configure.patch
 Patch2:         %{name}-5.6.57-jpl-configure-alpha.patch
 Patch3:         %{name}-5.6.60-jni.patch
+Patch4:         %{name}-5.7.11-man-files.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  gmp-devel
@@ -103,10 +104,11 @@ in Prolog.  In both setups it provides a
 %patch1 -p1 -b .libjvm
 %patch2 -p1 -b .libjvm-alpha
 %patch3 -p1 -b .jni
+%patch4 -p1 -b .man-files
 (
    mkdir doc-install
    cd doc-install
-   tar zxf %{SOURCE1}
+   cp -p %{SOURCE1} .
 )
 (
    mkdir xpce-doc
@@ -174,6 +176,11 @@ mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{v
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/include
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/xpce-*/include
 
+# Move the binaries into %{_bindir} directly instead of using links
+rm -f $RPM_BUILD_ROOT%{_bindir}/*
+mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin/*/* $RPM_BUILD_ROOT%{_bindir}
+rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin
+
 # Clean up the other stuff that shouldn't be packaged
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/man
 rm -rf $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/doc
@@ -239,6 +246,16 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Jul  6 2009 Mary Ellen Foster <mefoster at gmail.com> - 5.6.64-2
+- Move binaries into /usr/bin directly to fix multilib issues
+- Removed the FILES section of the man page because it also caused
+  multilib conflicts (and was inaccurate anyway)
+
+* Fri Jun 12 2009 Mary Ellen Foster <mefoster at gmail.com> - 5.6.64-1
+- Update to latest upstream 5.6.x release
+  - Fix many threading and other bugs; see ChangeLog for full details
+- Switch to PDF manual because HTML version isn't available any more
+
 * Mon Mar 02 2009 Dennis Gilmore <dennis at ausil.us> - 5.6.60-4
 - fix JAVA_HOME and JAVA_LIB for sparc arches
 


--- pl-5.6.0-multilib.patch DELETED ---


--- pl-5.6.52-jni.patch DELETED ---


--- pl-5.6.55-configure.patch DELETED ---


--- pl-5.6.57-locale.patch DELETED ---