瀏覽代碼

upgrading package: python 2.5.1 -> 2.5.2

Ralf S. Engelschall 17 年之前
父節點
當前提交
00ad9a3e4f
共有 2 個文件被更改,包括 31 次插入24 次删除
  1. 29 22
      python/python.patch
  2. 2 2
      python/python.spec

+ 29 - 22
python/python.patch

@@ -1,7 +1,7 @@
 Index: Include/pyport.h
---- Include/pyport.h.orig	2006-06-10 14:23:46 +0200
-+++ Include/pyport.h	2006-11-03 19:29:10 +0100
-@@ -370,8 +370,12 @@
+--- Include/pyport.h.orig	2008-02-14 12:26:18 +0100
++++ Include/pyport.h	2008-02-25 07:54:15 +0100
+@@ -401,8 +401,12 @@
   * config to #define Py_HUGE_VAL to something that works on your platform.
   */
  #ifndef Py_HUGE_VAL
@@ -15,8 +15,8 @@ Index: Include/pyport.h
  /* Py_OVERFLOWED(X)
   * Return 1 iff a libm function overflowed.  Set errno to 0 before calling
 Index: Modules/_ctypes/libffi/configure
---- Modules/_ctypes/libffi/configure.orig	2006-08-14 18:17:41 +0200
-+++ Modules/_ctypes/libffi/configure	2006-11-03 19:29:10 +0100
+--- Modules/_ctypes/libffi/configure.orig	2007-09-05 01:47:16 +0200
++++ Modules/_ctypes/libffi/configure	2008-02-25 07:54:15 +0100
 @@ -3516,7 +3516,7 @@
  cris-*-*) TARGET=LIBFFI_CRIS; TARGETDIR=cris;;
  s390-*-linux-*) TARGET=S390; TARGETDIR=s390;;
@@ -27,23 +27,30 @@ Index: Modules/_ctypes/libffi/configure
  sh-*-rtems*) TARGET=SH; TARGETDIR=sh;;
  sh64-*-linux* | sh5*-*-linux*) TARGET=SH64; TARGETDIR=sh64;;
 Index: configure
---- configure.orig	2006-09-05 04:54:42 +0200
-+++ configure	2006-11-03 19:29:10 +0100
-@@ -3800,11 +3800,11 @@
+--- configure.orig	2008-02-13 20:17:17 +0100
++++ configure	2008-02-25 07:56:56 +0100
+@@ -3014,9 +3014,9 @@
+   CFLAGS=$ac_save_CFLAGS
+ elif test $ac_cv_prog_cc_g = yes; then
+   if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
++    CFLAGS="-O2"
+   else
+-    CFLAGS="-g"
++    CFLAGS=""
+   fi
+ else
+   if test "$GCC" = yes; then
+@@ -4442,7 +4442,7 @@
  		# debug builds.
  		OPT="-g -Wall $STRICT_PROTO"
  	    else
--		OPT="-g -O3 -Wall $STRICT_PROTO"
-+		OPT="-g -O2 -Wall $STRICT_PROTO"
+-		OPT="-g $WRAP -O3 -Wall $STRICT_PROTO"
++		OPT="$WRAP -O3 -Wall $STRICT_PROTO"
  	    fi
  	    ;;
  	*)
--	    OPT="-O3 -Wall $STRICT_PROTO"
-+	    OPT="-O2 -Wall $STRICT_PROTO"
- 	    ;;
- 	esac
- 	case $ac_sys_system in
-@@ -11136,7 +11136,7 @@
+@@ -11661,7 +11661,7 @@
  		then
  			LINKFORSHARED="-Wl,--export-dynamic"
  		fi;;
@@ -53,8 +60,8 @@ Index: configure
  		    if $CC -Xlinker --help 2>&1 | grep export-dynamic >/dev/null
  		    then
 Index: setup.py
---- setup.py.orig	2006-08-10 01:42:18 +0200
-+++ setup.py	2006-11-03 19:29:10 +0100
+--- setup.py.orig	2008-02-05 00:41:02 +0100
++++ setup.py	2008-02-25 07:54:15 +0100
 @@ -244,8 +244,8 @@
  
      def detect_modules(self):
@@ -66,7 +73,7 @@ Index: setup.py
  
          # Add paths specified in the environment variables LDFLAGS and
          # CPPFLAGS for header and library files.
-@@ -520,8 +520,6 @@
+@@ -521,8 +521,6 @@
                                 depends = ['socketmodule.h']) )
          # Detect SSL support for the socket module (via _ssl)
          search_for_ssl_incs_in = [
@@ -75,7 +82,7 @@ Index: setup.py
                               ]
          ssl_incs = find_file('openssl/ssl.h', inc_dirs,
                               search_for_ssl_incs_in
-@@ -532,8 +530,7 @@
+@@ -533,8 +531,7 @@
              if krb5_h:
                  ssl_incs += krb5_h
          ssl_libs = find_library_file(self.compiler, 'ssl',lib_dirs,
@@ -85,7 +92,7 @@ Index: setup.py
                                       ] )
  
          if (ssl_incs is not None and
-@@ -614,11 +611,9 @@
+@@ -619,11 +616,9 @@
          # top of the normal inc_dirs.
          db_inc_paths = [
              '/usr/include/db4',
@@ -97,7 +104,7 @@ Index: setup.py
              '/opt/sfw/include/db3',
              '/sw/include/db3',
          ]
-@@ -1223,6 +1218,7 @@
+@@ -1242,6 +1237,7 @@
                  dotversion = dotversion[:-1] + '.' + dotversion[-1]
              tcl_include_sub = []
              tk_include_sub = []

+ 2 - 2
python/python.spec

@@ -31,8 +31,8 @@ Distribution: OpenPKG Community
 Class:        BASE
 Group:        Language
 License:      GPL
-Version:      2.5.1
-Release:      20080101
+Version:      2.5.2
+Release:      20080225
 
 #   package options
 %option       with_readline      no