diff --git a/web/index.html b/web/index.html
index f0db307..7c325c7 100644
--- a/web/index.html
+++ b/web/index.html
@@ -23,7 +23,7 @@
<body>
<h1>Spek – Acoustic Spectrum Analyser</h1>
<p><img src="spek.png" width="160" height="96" alt="Spek logo" style="float:right;"/>Spek (<a href="http://en.wikipedia.org/wiki/International_Phonetic_Alphabet">IPA</a>: /spɛk/, ‘bacon’ in Dutch) helps to analyse your audio files by showing their <a href="http://en.wikipedia.org/wiki/Spectrogram">spectrogram</a>.</p>
- <p>Spek supports all popular lossy and lossless audio file formats. Spek is free software available for GNU/Linux, Windows and Mac OS X.</p>
+ <p>Spek supports all popular lossy and lossless audio file formats. Spek is free software available for Unix, Windows and Mac OS X.</p>
<h2>Download</h2>
<table id="download">
@@ -35,7 +35,7 @@
<td class="dld_link">
<a href="http://spek.googlecode.com/files/spek-0.6.tar.bz2">spek-0.6.tar.bz2</a> (198 KiB)
<br/>
- <a href="http://code.google.com/p/spek/wiki/LinuxInstall">instructions</a>
+ <a href="http://code.google.com/p/spek/wiki/UnixInstall">instructions</a>
</td>
</tr>
</table>
@@ -85,7 +85,7 @@
<h2>News <a href="http://versia.com/category/spek/feed/atom/"><img src="feed-icon-14x14.png" alt="news feed"/></a></h2>
<ul>
- <li>2010-07-13: <a href="http://versia.com/2010/07/13/spek-0-6-released/">Spek 0.6 Released</a></li>
+ <li>2010-07-13: <a href="http://versia.com/2010/07/13/spek-0-6-release/">Spek 0.6 Released</a></li>
<li>2010-07-04: <a href="http://versia.com/2010/07/04/gstreamer-ffmpeg-and-spek/">GStreamer, FFmpeg and Spek</a></li>
<li>2010-06-26: <a href="http://versia.com/2010/06/27/spek-0-5-mac-os-x-port/">Spek 0.5 - Mac OS X port</a></li>
<li>2010-05-21: <a href="http://versia.com/2010/05/21/spek-0-4-released/">Spek 0.4 Released</a></li>
diff --git a/wiki/OsxInstall.wiki b/wiki/OsxInstall.wiki
index fb3fd65..07ed562 100644
--- a/wiki/OsxInstall.wiki
+++ b/wiki/OsxInstall.wiki
@@ -3,7 +3,7 @@
== Binary package ==
-Experimental version of Spek for Mac OS X is available in the download section. Download and open the DMG package, then drag the Spek icon to Applications.
+Spek for Mac OS X is available in the download section. Download and open the DMG package, then drag the Spek icon to Applications.
Spek requires OS X 10.5 or 10.6 and an Intel-based Mac.
@@ -14,12 +14,7 @@ Spek can be built using packages from [http://www.macports.org/ MacPorts]. After
{{{
$ sudo port install intltool
$ sudo port install gtk2 +quartz +no_x11
-$ sudo port install gstreamer
-$ sudo port install gst-plugins-base +no_gnome_vfs +no_x11
-$ sudo port install gst-plugins-good
-$ sudo port install gst-plugins-bad +no_x11
-$ sudo port install gst-plugins-ugly
-$ sudo port install gst-ffmpeg
+$ sudo port install ffmpeg-devel
}}}
Then download the source code tarball and run these commands from terminal:
diff --git a/wiki/LinuxInstall.wiki b/wiki/UnixInstall.wiki
similarity index 63%
rename from wiki/LinuxInstall.wiki
rename to wiki/UnixInstall.wiki
index b3846f1..2c6eb62 100644
--- a/wiki/LinuxInstall.wiki
+++ b/wiki/UnixInstall.wiki
@@ -1,5 +1,5 @@
#labels Featured
-= GNU/Linux installation instructions =
+= Unix installation instructions =
== Binary packages ==
@@ -8,40 +8,43 @@ Spek is not yet packaged on many distributions, help in this area will be greatl
* *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) and [http://dl.dropbox.com/u/1099005/spek_0.4-1_i386.deb v0.4 i386] (DEB by !KoxxBoxx).
+ * *FreeBSD*: [http://www.freebsd.org/cgi/query-pr.cgi?pr=150381 ports/150381]
+ * *Ubuntu*: [http://dl.dropbox.com/u/124437/spek_0.4-1_amd64.deb v0.4 amd64] (DEB by mcnellis), [http://dl.dropbox.com/u/1099005/spek_0.4-1_i386.deb v0.4 i386] (DEB by !KoxxBoxx) and [http://sharebee.com/f3899f48 v0.5 i386] (DEB by loskutov0).
== Building from the tarball ==
To build Spek, download the source code tarball then run these commands from terminal:
{{{
-$ tar -xjvf spek-0.x.tar.bz2
-$ cd spek-0.x
-$ ./configure
-$ make
+% tar -xjvf spek-0.x.tar.bz2
+% cd spek-0.x
+% ./configure
+% make
}}}
-To build you will need GTK+ and FFmpeg packages. On Debian/Ubuntu you also need development packages: libgtk2.0-dev, libavcodec-dev and libavformat-dev. For MP3 support you will need FFmpeg compiled with restricted codecs. On Ubuntu you can install ubuntu-restricted-extras, on Debian you can use FFmpeg from [http://debian-multimedia.org/ Debian Multimedia]. Also note that Ubuntu's FFmpeg is very outdated, you might need to install it from a third-party PPA.
+To build you will need GTK+ and FFmpeg packages. On Debian/Ubuntu you also need development packages: libgtk2.0-dev, libavcodec-dev and libavformat-dev. For MP3 support you will need FFmpeg compiled with restricted codecs. On Ubuntu you can install ubuntu-restricted-extras. On Debian you can use FFmpeg from [http://debian-multimedia.org/ Debian Multimedia]. On Fedora you need ffmpeg-devel from rpmfusion-free-updates.
+
+Also note that Ubuntu's FFmpeg is very outdated, you might need to install it from a third-party [https://launchpad.net/ubuntu/+ppas?name_filter=ffmpeg PPA] or [http://ubuntuforums.org/showthread.php?t=786095 from svn].
To start Spek, run:
{{{
-$ src/spek
+% src/spek
}}}
Or install it with:
{{{
-$ sudo make install
+% sudo make install
}}}
== Building from the git repository ==
{{{
-$ git clone git://gitorious.org/spek/spek.git spek
-$ cd spek
-$ ./autogen.sh
-$ make
+% git clone git://gitorious.org/spek/spek.git
+% 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