Added a ``--single-version-externally-managed`` option to the ``install``

command so that you can more easily wrap a "flat" egg in a system package.
Enhanced ``bdist_rpm`` so that it installs single-version eggs that
don't rely on a ``.pth`` file.  The ``--no-egg`` option has been removed,
since all RPMs are now built in a more backwards-compatible format.

Some work is now needed for easy_install to recognize bdist_wininst
.exe's that wrap these new flat eggs, as currently the .egg-info will
not be recognized.

--HG--
branch : setuptools
extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4041673

1 files changed, 4 insertions, 18 deletions

diff --git a/setuptools/command/bdist_rpm.py b/setuptools/command/bdist_rpm.py
index 4db04a32..1a0b0484 100755
--- a/setuptools/command/bdist_rpm.py
+++ b/setuptools/command/bdist_rpm.py
@@ -6,12 +6,6 @@ from distutils.command.bdist_rpm import bdist_rpm as _bdist_rpm
 
 class bdist_rpm(_bdist_rpm):
 
-    user_options = _bdist_rpm.user_options + [
-        ('no-egg', None, "Don't install as an egg (may break the package!)")
-    ]
-
-    boolean_options = _bdist_rpm.boolean_options + ['no-egg']
-
     def initialize_options(self):
         _bdist_rpm.initialize_options(self)
         self.no_egg = None
@@ -31,24 +25,16 @@ class bdist_rpm(_bdist_rpm):
                 "Source0: %{name}-%{version}.tar",
                 "Source0: %{name}-%{unmangled_version}.tar"
             ).replace(
+                "setup.py install ",
+                "setup.py install --single-version-externally-managed "
+            ).replace(
                 "%setup",
                 "%setup -n %{name}-%{unmangled_version}"
             ).replace(line23,line24)
             for line in spec
         ]
         spec.insert(spec.index(line24)+1, "%define unmangled_version "+version)
-
-
-        if not self.no_egg:
-            return spec
-
-        # Hack the spec file so that we install old-style
-        return [
-            line.replace(
-                "setup.py install ","setup.py install --old-and-unmanageable "
-            ) for line in spec
-        ]
-
+        return spec