From be64ec82fde16e6091f15e0f7612d2bd090600e3 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Fri, 11 Jun 2010 19:22:34 +1000
Subject: [PATCH] [web] Update Linux installation instructions

---
 web/index.html         |  2 +-
 wiki/LinuxInstall.wiki | 28 ++++++++++++++++++++++++----
 2 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/web/index.html b/web/index.html
index f80f5d1..8651cfe 100644
--- a/web/index.html
+++ b/web/index.html
@@ -39,7 +39,7 @@
     <p><a href="http://spek.googlecode.com/files/spek-0.4.msi">Spek 0.4 for Windows</a> (x86 MSI installer, 17.1 MiB)</p>
     <p><a href="http://spek.googlecode.com/files/spek-0.4.tar.bz2">Spek 0.4 for GNU/Linux</a> (source code tar.bz2, 192 KiB)</p>
     <p>To install on Windows just download and double-click the MSI installer. After asking a few questions, Spek will install automatically.</p>
-    <p>To install on GNU/Linux, follow  <a href="http://code.google.com/p/spek/wiki/LinuxInstall">these instructions</a>. Software requirements: GTK+ &ge; 2.14, GStreamer &ge; 0.10.17 (including gst-plugins-base and gst-plugins-good). For MP3 support you also need gst-plugins-ugly.</p>
+    <p>To install on GNU/Linux, follow  <a href="http://code.google.com/p/spek/wiki/LinuxInstall">these instructions</a>.</p>
 
     <h2>News <a href="http://versia.com/category/spek/feed/atom/"><img src="feed-icon-14x14.png" alt="news feed"/></a></h2>
     <ul>
diff --git a/wiki/LinuxInstall.wiki b/wiki/LinuxInstall.wiki
index 96243d3..79f3ecb 100644
--- a/wiki/LinuxInstall.wiki
+++ b/wiki/LinuxInstall.wiki
@@ -1,8 +1,17 @@
-#summary GNU/Linux installation instructions
 #labels Featured
-
 = GNU/Linux installation instructions =
 
+== Binary packages ==
+
+Spek is not yet packaged on many distributions, help in this area will be greatly appreciated.
+
+ * *Arch Linux*: Use one of the packages in the AUR: [http://aur.archlinux.org/packages.php?ID=38001 spek] and [http://aur.archlinux.org/packages.php?ID=37252 spek-git].
+ * *Debian*: RFP (request for packaging): [http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584524 bug #584524].
+ * *Fedora*: [http://dl.dropbox.com/u/6598054/spek-0.4-5.fc13.x86_64.rpm v0.4 x86_64], [http://dl.dropbox.com/u/6598054/spek-0.4-5.fc13.i686.rpm v0.4 i686] and [http://dl.dropbox.com/u/6598054/spek-0.4-5.fc13.src.rpm v0.4 source] (RPMs by scorp6). There's also a review request needing a sponsor: [https://bugzilla.redhat.com/show_bug.cgi?id=597888 bug #597888].
+ * *Ubuntu*: [http://dl.dropbox.com/u/124437/spek_0.4-1_amd64.deb v0.4 amd64] (DEB by mcnellis).
+
+== Building from the tarball ==
+
 To build Spek, download the source code tarball then run these commands from terminal:
 
 {{{
@@ -12,7 +21,7 @@ $ ./configure
 $ make
 }}}
 
-You will need GStreamer and GTK+ packages installed to build. On Debian/Ubuntu you will also need development packages: libgstreamer0.10-dev and libgtk2.0-dev.
+To build you will need GTK+ and GStreamer packages, including gst-plugins-base and gst-plugins-good. For MP3 support you need gst-plugins-ugly. On Debian/Ubuntu you also need development packages: libgstreamer0.10-dev and libgtk2.0-dev.
 
 To start Spek, run:
 
@@ -24,4 +33,15 @@ Or install it with:
 
 {{{
 $ sudo make install
-}}}
\ No newline at end of file
+}}}
+
+== Building from the git repository ==
+
+{{{
+$ git clone git://gitorious.org/spek/spek.git spek
+$ cd spek
+$ ./autogen.sh
+$ make
+}}}
+
+In addition to the packages listed above, you will need autotools and the Vala compiler (normally packaged as valac).
\ No newline at end of file