python26-distribute/distribute-python2_and_3.patch

   1 diff -Naur distribute-0.6.16.ori/distribute.egg-info/entry_points.txt distribute-0.6.16/distribute.egg-info/entry_points.txt
   2 --- distribute-0.6.16.ori/distribute.egg-info/entry_points.txt  2011-04-30 06:11:02.000000000 -0700
   3 +++ distribute-0.6.16/distribute.egg-info/entry_points.txt      2011-05-03 10:35:31.027759028 -0700
   4 @@ -33,6 +33,7 @@
   5  [console_scripts]
   6  easy_install = setuptools.command.easy_install:main
   7  easy_install-2.7 = setuptools.command.easy_install:main
   8 +easy_install-3.2 = setuptools.command.easy_install:main
   9
  10  [setuptools.file_finders]
  11  svn_cvs = setuptools.command.sdist:_default_revctrl
  12 diff -Naur distribute-0.6.16.ori/distribute_setup.py distribute-0.6.16/distribute_setup.py
  13 --- distribute-0.6.16.ori/distribute_setup.py   2011-03-18 07:32:22.000000000 -0700
  14 +++ distribute-0.6.16/distribute_setup.py       2011-05-03 10:36:38.231094059 -0700
  15 @@ -299,8 +299,7 @@
  16          log.warn('Could not find the install location')
  17          return
  18      pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
  19 -    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
  20 -            (SETUPTOOLS_FAKED_VERSION, pyver)
  21 +    setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
  22      pkg_info = os.path.join(placeholder, setuptools_file)
  23      if os.path.exists(pkg_info):
  24          log.warn('%s already exists', pkg_info)
  25 diff -Naur distribute-0.6.16.ori/setup.py distribute-0.6.16/setup.py
  26 --- distribute-0.6.16.ori/setup.py      2011-03-18 07:32:22.000000000 -0700
  27 +++ distribute-0.6.16/setup.py  2011-05-03 10:36:38.231094059 -0700
  28 @@ -96,6 +96,8 @@
  29                  f.close()
  30
  31
  32 +console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
  33 +
  34  # if we are installing Distribute using "python setup.py install"
  35  # we need to get setuptools out of the way
  36  def _easy_install_marker():
  37 @@ -182,11 +184,7 @@
  38              "dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
  39          ],
  40
  41 -        "console_scripts": [
  42 -             "easy_install = setuptools.command.easy_install:main",
  43 -             "easy_install-%s = setuptools.command.easy_install:main"
  44 -                % sys.version[:3]
  45 -        ],
  46 +        "console_scripts": console_scripts,
  47
  48          "setuptools.file_finders":
  49              ["svn_cvs = setuptools.command.sdist:_default_revctrl"],