rpms/blt/devel blt2.4z-patch-64,NONE,1.1 blt.spec,1.5,1.6

[Ville Skytta (scop)]

Author: scop

Update of /cvs/extras/rpms/blt/devel
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10936

Modified Files:
	blt.spec 
Added Files:
	blt2.4z-patch-64 
Log Message:
Sync with 0.fdr.10.z (x86_64 build fix) from Jean-Luc, demacroize %changelog.


--- NEW FILE blt2.4z-patch-64 ---
diff -r -u blt2.4z.orig/src/bltTree.c blt2.4z/src/bltTree.c
--- blt2.4z.orig/src/bltTree.c	2002-09-29 07:44:12.000000000 +0200
+++ blt2.4z/src/bltTree.c	2004-11-05 12:27:45.797366712 +0100
@@ -95,17 +95,16 @@
  */
 
 #define REBUILD_MULTIPLIER	3
+#define START_LOGSIZE		5 /* Initial hash table size is 32. */
+#define MAX_LIST_VALUES		20 /* Convert to hash table when node
+				    * value list gets bigger than this
+				    * many values. */
 
 #if (SIZEOF_VOID_P == 8)
 #define RANDOM_INDEX(i)		HashOneWord(mask, downshift, i)
 #define BITSPERWORD		64
 #else 
 
-#define START_LOGSIZE		5 /* Initial hash table size is 32. */
-#define MAX_LIST_VALUES		20 /* Convert to hash table when node
-				    * value list gets bigger than this
-				    * many values. */
-
 /*
  * The following macro takes a preliminary integer hash value and
  * produces an index into a hash tables bucket list.  The idea is


Index: blt.spec
===================================================================
RCS file: /cvs/extras/rpms/blt/devel/blt.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- blt.spec	10 Dec 2004 22:03:01 -0000	1.5
+++ blt.spec	17 Dec 2004 18:47:50 -0000	1.6
@@ -1,12 +1,13 @@
 Summary: BLT widget extension to Tcl/Tk scripting language development
 Name: blt
 Version: 2.4
-Release: 9.z
+Release: 10.z
 Epoch: 0
 License: MIT
 Group: Development/Libraries
 Source: http://download.sourceforge.net/blt/BLT2.4z.tar.gz
-Patch: http://download.sourceforge.net/blt/blt2.4z-patch-2
+Patch0: http://download.sourceforge.net/blt/blt2.4z-patch-2
+Patch1: http://jfontain.free.fr/blt2.4z-patch-64
 URL: http://sourceforge.net/projects/blt/
 BuildRequires: XFree86-devel >= 0:4, tk >= 0:8.3.1
 # work around tcl-devel and tk-devel packages non existence in RH 8.0 and 9:
@@ -25,10 +26,11 @@
 
 %prep
 %setup -q -n %name%{version}z
-%patch -p1
+%patch0 -p1
+%patch1 -p1
 
 %build
-%configure --with-tcl=%_prefix --with-tk=%_prefix
+%configure --with-tcl=%_libdir --with-tk=%_libdir
 cd src/shared
 %__make SHLIB_LD_FLAGS=-shared # no _smp_mflags; race conditions.
 
@@ -51,6 +53,9 @@
 %_libdir/%name%{version}
 
 %changelog
+* Fri Nov 5 2004 Jean-Luc Fontaine <jfontain at free.fr> 0:2.4-10.z
+- added patch to allow building on 64 bit architectures
+- use %%libdir instead of %%prefix in configure for the same reason
 
 * Tue Nov 16 2003 Jean-Luc Fontaine <jfontain at free.fr> 0:2.4-0.fdr.9.z
 - in build requirements, work around tcl-devel and tk-devel packages non
@@ -81,7 +86,7 @@
 
 * Tue Nov 1 2003 Jean-Luc Fontaine <jfontain at free.fr> 0:2.4-0.fdr.5.z
 - removed RCS line
-- set Epoch to 0 and removed it from Release.1
+- set Epoch to 0 and removed it from Release
 - used a full macroless URL to the source tarball and patches
 - removed Packager (not used in Fedora)
 - used rm instead of %%__rm macro