From 21d70eb6f28471cc3ed1ea031229f40b49edd349 Mon Sep 17 00:00:00 2001
From: Alexander Kojevnikov <alexander@kojevnikov.com>
Date: Wed, 20 Apr 2011 21:13:20 +0800
Subject: [PATCH] osx: @VERSION@ usage in spek.modules

---
 .gitignore                                 | 26 +++++++++++-----------
 Makefile.am                                |  1 +
 configure.ac                               |  1 +
 dist/osx/{spek.modules => spek.modules.in} |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)
 rename dist/osx/{spek.modules => spek.modules.in} (96%)

diff --git a/.gitignore b/.gitignore
index 636c7f9..fb5b7b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,32 @@
-!src/spek-audio.c
-!src/spek-fft.c
-!src/spek-platform.c
-*.bz2
-*.msi
 *~
-.DS_Store
-.deps
-.svn
-Makefile
-Makefile.in
-Makefile.in.in
 aclocal.m4
 autom4te.cache
+*.bz2
 compile
 config.*
 configure
 data/spek.desktop
 data/spek.desktop.in
 depcomp
+.deps
 dist/osx/Spek.app
 dist/osx/Spek.dmg
-dist/osx/bin
+dist/osx/spek.modules
 dist/win/spek.wxs
+.DS_Store
 install-sh
 intltool-extract.in
 intltool-merge.in
 intltool-update.in
 libtool
 ltmain.sh
+Makefile
+Makefile.in
+Makefile.in.in
 man/spek.1
 missing
 mkinstalldirs
+*.msi
 omf.make
 po/*.gmo
 po/.intltool-merge-cache
@@ -39,9 +35,13 @@ po/stamp-it
 samples/
 src/*.c
 src/*.o
-src/*.stamp
 src/spek
+!src/spek-audio.c
+!src/spek-fft.c
+!src/spek-platform.c
+src/*.stamp
 stamp-h1
+.svn
 test*
 web/version
 xmldocs.make
diff --git a/Makefile.am b/Makefile.am
index 2b716bd..00afe63 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -19,6 +19,7 @@ EXTRA_DIST = \
 	dist/osx/gtkrc \
 	dist/osx/launcher.sh \
 	dist/osx/spek.bundle \
+	dist/osx/spek.modules \
 	dist/win/LICENSE.rtf \
 	dist/win/banner.bmp \
 	dist/win/bundle.sh \
diff --git a/configure.ac b/configure.ac
index c545462..76b2c21 100644
--- a/configure.ac
+++ b/configure.ac
@@ -55,6 +55,7 @@ AC_CONFIG_FILES([
 	data/icons/32x32/Makefile
 	data/icons/48x48/Makefile
 	data/icons/scalable/Makefile
+	dist/osx/spek.modules
 	dist/win/spek.wxs
 	man/Makefile
 	man/spek.1
diff --git a/dist/osx/spek.modules b/dist/osx/spek.modules.in
similarity index 96%
rename from dist/osx/spek.modules
rename to dist/osx/spek.modules.in
index 219d881..77b965a 100644
--- a/dist/osx/spek.modules
+++ b/dist/osx/spek.modules.in
@@ -33,7 +33,7 @@
 	</autotools>
 
 	<autotools id="spek" autogen-sh="configure">
-		<branch module="spek-0.6.tar.bz2" version="0.6" repo="spek"/>
+		<branch module="spek-@VERSION@.tar.bz2" version="@VERSION@" repo="spek"/>
 		<dependencies>
 			<dep package="meta-gtk-osx-bootstrap"/>
 			<dep package="meta-gtk-osx-core"/>