patches/codeina-01-fixpython.diff
author jurikm
Sun, 12 Feb 2012 14:04:10 +0000
changeset 8245 383896da4129
parent 2998 2e7d1029606f
permissions -rw-r--r--
SFEsauerbraten.spec: add IPS package name
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
2998
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     1
--- codeina-0.10.2.1/bin/codeina.bin-orig	2008-04-24 18:53:31.231400000 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     2
+++ codeina-0.10.2.1/bin/codeina.bin	2008-04-24 18:53:37.282456000 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     3
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     4
-#!/usr/bin/env python2.5
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     5
+#!/usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     6
 # -*- Mode: Python -*-
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     7
 # -*- coding: utf-8 -*-
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     8
 # vi:si:et:sw=4:sts=4:ts=4
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
     9
--- codeina-0.10.6/common/m4/as-python.m4-orig	2009-10-12 18:58:40.307344552 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    10
+++ codeina-0.10.6/common/m4/as-python.m4	2009-10-12 18:59:10.554318148 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    11
@@ -40,7 +40,7 @@ AC_DEFUN([AS_PATH_PYTHON],
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    12
   dnl in 1.5, and I don't want to maintain that logic.
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    13
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    14
   dnl should we do the version check?
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    15
-  PYTHON_CANDIDATES="python python2.2 python2.1 python2.0 python2 \
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    16
+  PYTHON_CANDIDATES="python2.6 python python2.2 python2.1 python2.0 python2 \
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    17
                      python1.6 python1.5"
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    18
   ifelse([$1],[],
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    19
          [AC_PATH_PROG(PYTHON, $PYTHON_CANDIDATES)],
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    20
--- codeina-0.10.6/codeina/extern/which.py-orig	2009-10-27 17:21:38.956709576 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    21
+++ codeina-0.10.6/codeina/extern/which.py	2009-10-27 17:22:40.999961099 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    22
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    23
-#!/usr/bin/env python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    24
+#!/usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    25
 # Copyright (c) 2002-2005 ActiveState Corp.
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    26
 # See LICENSE.txt for license details.
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    27
 # Author:
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    28
--- codeina-0.10.6/codeina/httpdownload.py-orig	2009-10-27 17:21:51.047863926 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    29
+++ codeina-0.10.6/codeina/httpdownload.py	2009-10-27 17:22:28.750278481 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    30
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    31
-#!/usr/bin/env python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    32
+#!/usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    33
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    34
 import os.path
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    35
 import os
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    36
--- codeina-0.10.6/codeina/events.py-orig	2009-10-27 17:21:27.387668519 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    37
+++ codeina-0.10.6/codeina/events.py	2009-10-27 17:22:20.205088299 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    38
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    39
-#! /usr/bin/env python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    40
+#! /usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    41
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    42
 """ This is the event system. It is distinct from pygame's event
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    43
 system, because this one is truly and entirely callback-driven.
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    44
--- codeina-0.10.6/common/scangobj-merge.py-orig	2009-10-27 17:28:13.905349708 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    45
+++ codeina-0.10.6/common/scangobj-merge.py	2009-10-27 17:28:23.710599367 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    46
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    47
-#!/usr/bin/python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    48
+#!/usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    49
 # -*- Mode: Python -*-
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    50
 # vi:si:et:sw=4:sts=4:ts=4
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    51
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    52
--- codeina-0.10.6/misc/coverage-orig	2009-10-27 17:27:53.848614266 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    53
+++ codeina-0.10.6/misc/coverage	2009-10-27 17:27:58.177846483 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    54
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    55
-#! /usr/bin/python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    56
+#! /usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    57
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    58
 import os
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    59
 import sys
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    60
--- codeina-0.10.6/providers/get_mandriva_rpms-orig	2009-10-27 17:26:34.778437006 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    61
+++ codeina-0.10.6/providers/get_mandriva_rpms	2009-10-27 17:27:19.664315860 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    62
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    63
-#!/usr/bin/python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    64
+#!/usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    65
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    66
 from ftplib import FTP
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    67
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    68
--- codeina-0.10.6/providers/get_plf_rpms-orig	2009-10-27 17:26:52.735988707 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    69
+++ codeina-0.10.6/providers/get_plf_rpms	2009-10-27 17:27:24.734966180 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    70
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    71
-#!/usr/bin/python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    72
+#!/usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    73
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    74
 from ftplib import FTP
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    75
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    76
--- codeina-0.10.6/providers/merge_yaml2xml-orig	2009-10-27 17:27:06.298478653 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    77
+++ codeina-0.10.6/providers/merge_yaml2xml	2009-10-27 17:27:37.189058022 -0500
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    78
@@ -1,4 +1,4 @@
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    79
-#! /usr/bin/python
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    80
+#! /usr/bin/python2.6
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    81
 import xml.dom.minidom
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    82
 
2e7d1029606f 2010-11-02 Brian Cameron <[email protected]>
yippi
parents:
diff changeset
    83
 doc = xml.dom.minidom.Document()