rpms/blt/FC-1 blt2.4z-patch-64,NONE,1.1 blt.spec,1.3,1.4
Author: scop
Update of /cvs/extras/rpms/blt/FC-1
In directory cvs.fedora.redhat.com:/tmp/cvs-serv10660/FC-1
Modified Files:
blt.spec
Added Files:
blt2.4z-patch-64
Log Message:
auto-import blt-2.4-0.fdr.10.z.1 on branch FC-1 from blt-2.4-0.fdr.10.z.1.src.rpm
--- 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/FC-1/blt.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- blt.spec 8 Nov 2004 04:06:10 -0000 1.3
+++ blt.spec 17 Dec 2004 18:37:08 -0000 1.4
@@ -1,12 +1,13 @@
Summary: BLT widget extension to Tcl/Tk scripting language development
Name: blt
Version: 2.4
-Release: 0.fdr.9.z.1
+Release: 0.fdr.10.z.1
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.
@@ -52,6 +54,10 @@
%changelog
+* Fri Nov 5 2004 Jean-Luc Fontaine <jfontain(a)free.fr> 0:2.4-0.fdr.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(a)free.fr> 0:2.4-0.fdr.9.z
- in build requirements, work around tcl-devel and tk-devel packages non
existence in RH 8.0 and 9
@@ -81,7 +87,7 @@
* Tue Nov 1 2003 Jean-Luc Fontaine <jfontain(a)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