Lots of installation documentation improvements

docs/GUI.rst

@@ -6,7 +6,33 @@ easily monitor, analyze, introspect, and alter running Python programs.
 
 :source: https://github.com/lmacken/pyrasite-gui
 :download: http://pypi.python.org/pypi/pyrasite-gui
-:requirements: http://readthedocs.org/docs/pyrasite/en/latest/Installing.html#gui
+
+Requirements
+------------
+
+- Python debuginfo (needed for live object inspection)
+- PyGObject3 Introspection bindings
+- WebKitGTK3
+- `meliae <https://launchpad.net/meliae>`_ (easy_install/pip may not work for this install. If not, use the tarball from the distribution website. You may need to install `Cython <http://cython.org>`_ in order to get meliae to build)
+- `pycallgraph <http://pycallgraph.slowchop.com>`_
+- `psutil <http://code.google.com/p/psutil>`_
+
+Distribution-specific instructions
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.. code-block:: bash
+
+   # Fedora
+   yum --enablerepo=updates-testing install python-psutil python-debuginfo python-pycallgraph pygobject3 webkitgtk3 python-meliae
+
+   # Ubuntu:
+   apt-get install python-dbg python-pycallgraph python-gobject-dev gir1.2-webkit-3.0 python-meliae python-psutil
+
+   # Arch
+   pacman -S python2-psutil python2-gobject python2-pycallgraph libwebkit3 python2-meliae
+
+Screenshots
+-----------
 
 .. image:: http://lewk.org/img/pyrasite/pyrasite-info.png
 

docs/Installing.rst

@@ -4,62 +4,20 @@ Installing
 Requirements
 ~~~~~~~~~~~~
 
-Core
-----
+* `gdb <https://www.gnu.org/s/gdb>`_ (version 7.3+)
 
- * `gdb <https://www.gnu.org/s/gdb>`_ (version 7.3+)
-
-GUI
----
-
- - `Pyrasite <https://github.com/lmacken/pyrasite>`_
- - Python debuginfo (needed for live object inspection)
-
-   - Fedora: python-debuginfo, Ubuntu: python-dbg
-
- - PyGObject3 Introspection bindings
-
-   - Fedora: pygobject3, Ubuntu: python-gobject-dev, Arch: python2-gobject
-
- - WebKitGTK3
-
-   - Fedora: webkitgtk3, Ubuntu: gir1.2-webkit-3.0, Arch: libwebkit3
-
- - `meliae <https://launchpad.net/meliae>`_
-   - easy_install/pip may not work for this install. If not, use the tarball from the distribution website. You may need to install `Cython <http://cython.org>`_ in order to get meliae to build.
-
-   - Fedora: python-meliae, Ubuntu: python-meliae, Arch: python2-meliae
-
- - `pycallgraph <http://pycallgraph.slowchop.com>`_
-
-   - Fedora: python-pycallgraph, Ubuntu: python-pycallgraph, Arch: python2-pycallgraph
-
- - `psutil <http://code.google.com/p/psutil>`_
-
-   - Fedora: python-psutil, Ubuntu: python-psutil, Arch: python2-psutil
-
-Download
-~~~~~~~~
-
-Download the latest stable release from PyPi: http://pypi.python.org/pypi/pyrasite
-
-::
-
-    pip install pyrasite
+Installing
+~~~~~~~~~~
 
-Running from git
-~~~~~~~~~~~~~~~~
+You can download the latest tarballs, RPMs, and debs from `PyPi <http://pypi.python.org/pypi/pyrasite>`_. Installing the package specific to your distribution is recommended. However, you
+can also install it using ``pip`` if you wish
 
 ::
 
-    git clone git://github.com/lmacken/pyrasite.git
-    cd pyrasite
-    python -m pyrasite.main
+    pip install pyrasite pyrasite-gui
 
-.. note::
 
-   If you're on Python 2.4, you can run pyrasite by doing
-   ``PYTHONPATH=$(pwd) python pyrasite/main.py``
+.. seealso:: `pyrasite-gui <http://pyrasite.readthedocs.org/en/latest/GUI.html>`_ for instructions on installing the graphical interface
 
 Additional installation notes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -67,20 +25,6 @@ Additional installation notes
 Fedora
 ------
 
-pyrasite and pycallgraph are currently not available in Fedora. You can run
-pyrasite on Fedora by doing the following:
-
-.. code-block:: bash
-
-   sudo yum -y install python-meliae python-devel python-psutil pygobject3 graphviz python-virtualenv git-core gcc
-   sudo yum -y --enablerepo=\*-debuginfo install python-debuginfo
-   git clone -b develop git://github.com/lmacken/pyrasite.git
-   cd pyrasite
-   virtualenv [--system-site-packages if on F16+] env
-   source env/bin/activate
-   python setup.py develop
-   pyrasite-gui
-
 If you're using Fedora 17 or later, you'll need to disable an SELinux boolean to allow ptrace.
 
 .. code-block:: bash

pkgs/fedora/pyrasite.spec

@@ -33,7 +33,7 @@ also comes with a variety of example payloads.
 
 %build
 %{__python} setup.py build
-PYTHONPATH=$(pwd) make -C docs man
+%{__make} -C docs man
 
 %check
 %{__python} setup.py test