From 1cc6ee6b84a14f3ac511545d578e6145bf852983 Mon Sep 17 00:00:00 2001
From: Tim Waugh <twaugh@fedoraproject.org>
Date: Tue, 13 Jun 2006 12:44:33 +0000
Subject: [PATCH] - Fixed multilib fix (bug #194702).

---
 opensp-multilib.patch | 35 ++++++++++++++++++++++++++---------
 opensp.spec           |  5 ++++-
 2 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/opensp-multilib.patch b/opensp-multilib.patch
index 33bc47b..a988613 100644
--- a/opensp-multilib.patch
+++ b/opensp-multilib.patch
@@ -1,5 +1,5 @@
---- OpenSP-1.5.2/configure.in.multilib	2006-05-26 18:12:45.000000000 +0100
-+++ OpenSP-1.5.2/configure.in	2006-05-26 18:13:04.000000000 +0100
+--- OpenSP-1.5.2/configure.in.multilib	2005-12-23 14:15:21.000000000 +0000
++++ OpenSP-1.5.2/configure.in	2006-06-13 13:36:49.000000000 +0100
 @@ -90,7 +90,7 @@
  #define SP_SIZEOF_BOOL_1
  #endif
@@ -9,8 +9,8 @@
  #define SP_WCHAR_T_USHORT
  #endif
  
---- OpenSP-1.5.2/lib/parser_inst.cxx.multilib	2006-05-26 16:30:16.000000000 +0100
-+++ OpenSP-1.5.2/lib/parser_inst.cxx	2006-05-26 16:41:10.000000000 +0100
+--- OpenSP-1.5.2/lib/parser_inst.cxx.multilib	2005-07-21 16:33:41.000000000 +0100
++++ OpenSP-1.5.2/lib/parser_inst.cxx	2006-06-13 13:36:49.000000000 +0100
 @@ -9,6 +9,7 @@
  // Copyright (c) 1994 James Clark
  // See the file COPYING for copying permission.
@@ -28,8 +28,8 @@
  #ifdef __DECCXX
  #pragma define_template Vector<unsigned int>
  #else
---- OpenSP-1.5.2/lib/parser_inst.m4.multilib	2006-05-26 16:30:32.000000000 +0100
-+++ OpenSP-1.5.2/lib/parser_inst.m4	2006-05-26 16:39:32.000000000 +0100
+--- OpenSP-1.5.2/lib/parser_inst.m4.multilib	2005-05-14 10:17:35.000000000 +0100
++++ OpenSP-1.5.2/lib/parser_inst.m4	2006-06-13 13:36:49.000000000 +0100
 @@ -1,6 +1,7 @@
  // Copyright (c) 1994 James Clark
  // See the file COPYING for copying permission.
@@ -47,9 +47,17 @@
  __instantiate(Vector<unsigned int>)
  #endif
  
---- OpenSP-1.5.2/config.h.in.multilib	2006-05-26 16:41:21.000000000 +0100
-+++ OpenSP-1.5.2/config.h.in	2006-05-26 18:13:39.000000000 +0100
-@@ -333,22 +333,6 @@
+--- OpenSP-1.5.2/config.h.in.multilib	2005-11-05 09:43:42.000000000 +0000
++++ OpenSP-1.5.2/config.h.in	2006-06-13 13:41:45.000000000 +0100
+@@ -1,5 +1,7 @@
+ /* config.h.in.  Generated from configure.in by autoheader.  */
+ 
++#include <limits.h>
++
+ /* Define to one of `_getb67', `GETB67', `getb67' for Cray-2 and Cray-YMP
+    systems. This function is required for `alloca.c' support on those systems.
+    */
+@@ -333,22 +335,6 @@
  /* The size of a `bool', as computed by sizeof. */
  #undef SIZEOF_BOOL
  
@@ -72,3 +80,12 @@
  /* define this if h_errno should be declared extern int */
  #undef SP_DECLARE_H_ERRNO
  
+@@ -503,7 +489,7 @@
+ #define SP_SIZEOF_BOOL_1
+ #endif
+ 
+-#if (SIZEOF_WCHAR_T == SIZEOF_UNSIGNED_SHORT)
++#if (WCHAR_MAX == SHRT_MAX)
+ #define SP_WCHAR_T_USHORT
+ #endif
+ 
diff --git a/opensp.spec b/opensp.spec
index be79ae1..3ab5efe 100644
--- a/opensp.spec
+++ b/opensp.spec
@@ -1,7 +1,7 @@
 Summary: SGML and XML parser
 Name: opensp
 Version: 1.5.2
-Release: 2
+Release: 3
 Requires: sgml-common >= 0.5
 URL: http://openjade.sourceforge.net/
 Source: http://download.sourceforge.net/openjade/OpenSP-%{version}.tar.gz
@@ -97,6 +97,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 13 2006 Tim Waugh <twaugh@redhat.com> 1.5.2-3
+- Fixed multilib fix (bug #194702).
+
 * Fri May 26 2006 Tim Waugh <twaugh@redhat.com> 1.5.2-2
 - Fixed multilib devel conflicts (bug #192741).