- link with system expat (#245703)
This commit is contained in:
Jeremy Katz
parent
64142ef5c6
commit
787d525940
|
|
@ -1,6 +1,28 @@
|
|||
--- Python-2.5/Modules/Setup.dist.rhconfig 2006-08-06 03:26:21.000000000 -0400
|
||||
+++ Python-2.5/Modules/Setup.dist 2006-10-30 16:25:16.000000000 -0500
|
||||
@@ -149,7 +149,7 @@
|
||||
--- Python-2.5.1/Include/pyexpat.h.rhconfig 2007-06-26 18:40:21.000000000 -0400
|
||||
+++ Python-2.5.1/Include/pyexpat.h 2007-06-26 18:41:16.000000000 -0400
|
||||
@@ -5,6 +5,19 @@
|
||||
|
||||
#define PyExpat_CAPI_MAGIC "pyexpat.expat_CAPI 1.0"
|
||||
|
||||
+#ifdef XML_LARGE_SIZE /* Use large integers for file/stream positions. */
|
||||
+#if defined(XML_USE_MSC_EXTENSIONS) && _MSC_VER < 1400
|
||||
+typedef __int64 XML_Index;
|
||||
+typedef unsigned __int64 XML_Size;
|
||||
+#else
|
||||
+typedef long long XML_Index;
|
||||
+typedef unsigned long long XML_Size;
|
||||
+#endif
|
||||
+#else
|
||||
+typedef long XML_Index;
|
||||
+typedef unsigned long XML_Size;
|
||||
+#endif /* XML_LARGE_SIZE */
|
||||
+
|
||||
struct PyExpat_CAPI
|
||||
{
|
||||
char* magic; /* set to PyExpat_CAPI_MAGIC */
|
||||
--- Python-2.5.1/Modules/Setup.dist.rhconfig 2006-08-06 03:26:21.000000000 -0400
|
||||
+++ Python-2.5.1/Modules/Setup.dist 2007-06-26 18:41:40.000000000 -0400
|
||||
@@ -149,7 +149,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# modules are to be built as shared libraries (see above for more
|
||||
# detail; also note that *static* reverses this effect):
|
||||
|
||||
|
|
@ -9,7 +31,7 @@
|
|||
|
||||
# GNU readline. Unlike previous Python incarnations, GNU readline is
|
||||
# now incorporated in an optional module, configured in the Setup file
|
||||
@@ -159,69 +159,69 @@
|
||||
@@ -159,69 +159,69 @@ GLHACK=-Dclear=__GLclear
|
||||
# it, depending on your system -- see the GNU readline instructions.
|
||||
# It's okay for this to be a shared library, too.
|
||||
|
||||
|
|
@ -108,7 +130,7 @@
|
|||
|
||||
|
||||
# Multimedia modules -- off by default.
|
||||
@@ -229,9 +229,9 @@
|
||||
@@ -229,9 +229,9 @@ GLHACK=-Dclear=__GLclear
|
||||
# #993173 says audioop works on 64-bit platforms, though.
|
||||
# These represent audio samples or images as strings:
|
||||
|
||||
|
|
@ -121,7 +143,7 @@
|
|||
|
||||
|
||||
# Note that the _md5 and _sha modules are normally only built if the
|
||||
@@ -241,12 +241,12 @@
|
||||
@@ -241,12 +241,12 @@ GLHACK=-Dclear=__GLclear
|
||||
# Message-Digest Algorithm, described in RFC 1321. The necessary files
|
||||
# md5.c and md5.h are included here.
|
||||
|
||||
|
|
@ -136,7 +158,7 @@
|
|||
|
||||
|
||||
# SGI IRIX specific modules -- off by default.
|
||||
@@ -293,12 +293,12 @@
|
||||
@@ -293,12 +293,12 @@ GLHACK=-Dclear=__GLclear
|
||||
# A Linux specific module -- off by default; this may also work on
|
||||
# some *BSDs.
|
||||
|
||||
|
|
@ -151,7 +173,7 @@
|
|||
|
||||
|
||||
# The _tkinter module.
|
||||
@@ -313,7 +313,7 @@
|
||||
@@ -313,7 +313,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# every system.
|
||||
|
||||
# *** Always uncomment this (leave the leading underscore in!):
|
||||
|
|
@ -160,7 +182,7 @@
|
|||
# *** Uncomment and edit to reflect where your Tcl/Tk libraries are:
|
||||
# -L/usr/local/lib \
|
||||
# *** Uncomment and edit to reflect where your Tcl/Tk headers are:
|
||||
@@ -323,7 +323,7 @@
|
||||
@@ -323,7 +323,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# *** Or uncomment this for Solaris:
|
||||
# -I/usr/openwin/include \
|
||||
# *** Uncomment and edit for Tix extension only:
|
||||
|
|
@ -169,7 +191,7 @@
|
|||
# *** Uncomment and edit for BLT extension only:
|
||||
# -DWITH_BLT -I/usr/local/blt/blt8.0-unoff/include -lBLT8.0 \
|
||||
# *** Uncomment and edit for PIL (TkImaging) extension only:
|
||||
@@ -332,7 +332,7 @@
|
||||
@@ -332,7 +332,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# *** Uncomment and edit for TOGL extension only:
|
||||
# -DWITH_TOGL togl.c \
|
||||
# *** Uncomment and edit to reflect your Tcl/Tk versions:
|
||||
|
|
@ -178,7 +200,7 @@
|
|||
# *** Uncomment and edit to reflect where your X11 libraries are:
|
||||
# -L/usr/X11R6/lib \
|
||||
# *** Or uncomment this for Solaris:
|
||||
@@ -342,7 +342,7 @@
|
||||
@@ -342,7 +342,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# *** Uncomment for AIX:
|
||||
# -lld \
|
||||
# *** Always uncomment this; X11 libraries to link with:
|
||||
|
|
@ -187,7 +209,7 @@
|
|||
|
||||
# Lance Ellinghaus's syslog module
|
||||
#syslog syslogmodule.c # syslog daemon interface
|
||||
@@ -354,9 +354,9 @@
|
||||
@@ -354,9 +354,9 @@ GLHACK=-Dclear=__GLclear
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
|
|
@ -199,7 +221,7 @@
|
|||
|
||||
|
||||
# Generic (SunOS / SVR4) dynamic loading module.
|
||||
@@ -364,7 +364,7 @@
|
||||
@@ -364,7 +364,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# it is a highly experimental and dangerous device for calling
|
||||
# *arbitrary* C functions in *arbitrary* shared libraries:
|
||||
|
||||
|
|
@ -208,7 +230,7 @@
|
|||
|
||||
|
||||
# Modules that provide persistent dictionary-like semantics. You will
|
||||
@@ -387,7 +387,7 @@
|
||||
@@ -387,7 +387,7 @@ GLHACK=-Dclear=__GLclear
|
||||
#
|
||||
# First, look at Setup.config; configure may have set this for you.
|
||||
|
||||
|
|
@ -217,7 +239,7 @@
|
|||
|
||||
|
||||
# Sleepycat Berkeley DB interface.
|
||||
@@ -402,11 +402,10 @@
|
||||
@@ -402,11 +402,10 @@ GLHACK=-Dclear=__GLclear
|
||||
#
|
||||
# Edit the variables DB and DBLIBVERto point to the db top directory
|
||||
# and the subdirectory of PORT where you built it.
|
||||
|
|
@ -233,7 +255,7 @@
|
|||
|
||||
# Historical Berkeley DB 1.85
|
||||
#
|
||||
@@ -421,14 +420,14 @@
|
||||
@@ -421,14 +420,14 @@ GLHACK=-Dclear=__GLclear
|
||||
|
||||
|
||||
# Helper module for various ascii-encoders
|
||||
|
|
@ -252,7 +274,7 @@
|
|||
|
||||
|
||||
# Lee Busby's SIGFPE modules.
|
||||
@@ -451,7 +450,7 @@
|
||||
@@ -451,7 +450,7 @@ GLHACK=-Dclear=__GLclear
|
||||
# Andrew Kuchling's zlib module.
|
||||
# This require zlib 1.1.3 (or later).
|
||||
# See http://www.gzip.org/zlib/
|
||||
|
|
@ -261,7 +283,14 @@
|
|||
|
||||
# Interface to the Expat XML parser
|
||||
#
|
||||
@@ -471,14 +470,14 @@
|
||||
@@ -465,20 +464,20 @@ GLHACK=-Dclear=__GLclear
|
||||
# More information on Expat can be found at www.libexpat.org.
|
||||
#
|
||||
#EXPAT_DIR=/usr/local/src/expat-1.95.2
|
||||
-#pyexpat pyexpat.c -DHAVE_EXPAT_H -I$(EXPAT_DIR)/lib -L$(EXPAT_DIR) -lexpat
|
||||
+pyexpat pyexpat.c -DHAVE_EXPAT_H -lexpat
|
||||
|
||||
|
||||
# Hye-Shik Chang's CJKCodecs
|
||||
|
||||
# multibytecodec is required for all the other CJK codec modules
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
Summary: An interpreted, interactive, object-oriented programming language.
|
||||
Name: %{python}
|
||||
Version: 2.5.1
|
||||
Release: 2%{?dist}
|
||||
Release: 3%{?dist}
|
||||
License: Python Software Foundation License v2
|
||||
Group: Development/Languages
|
||||
Provides: python-abi = %{pybasever}
|
||||
|
|
@ -405,6 +405,9 @@ rm -fr $RPM_BUILD_ROOT
|
|||
%{_libdir}/python%{pybasever}/lib-dynload/_tkinter.so
|
||||
|
||||
%changelog
|
||||
* Tue Jun 26 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-3
|
||||
- link with system expat (#245703)
|
||||
|
||||
* Thu Jun 21 2007 Jeremy Katz <katzj@redhat.com> - 2.5.1-2
|
||||
- rebuild to take advantage of hardlinking between identical pyc/pyo files
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue