[guitarix] Updated to upstream version 0.20.2

[Brendan Jones]

commit 8d800a5aa51aec2277788a780f9a1332c97854a1
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Sat Nov 12 09:19:08 2011 +0100

    Updated to upstream version 0.20.2

 .gitignore                 |    1 +
 guitarix-fsf-address.patch | 1932 --------------------------------------------
 guitarix-snapshot.sh       |    2 +-
 guitarix.spec              |   38 +-
 sources                    |    2 +-
 5 files changed, 20 insertions(+), 1955 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 94e2d54..4283c55 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ guitarix-0.11.0.tar.bz2
 /guitarix2-0.19.0-svn1245.tar.bz2
 =======
 >>>>>>> eb2f8801040969d8acb50eb969b246f19feab35b
+/guitarix2-0.20.2.tar.bz2
diff --git a/guitarix-snapshot.sh b/guitarix-snapshot.sh
index 3452ee3..7df349e 100644
--- a/guitarix-snapshot.sh
+++ b/guitarix-snapshot.sh
@@ -17,7 +17,7 @@ cleanup() {
 unset CDPATH
 pwd=$(pwd)
 name=guitarix2
-version=0.19.0
+version=0.20.0
 
 revision=$1
 
diff --git a/guitarix.spec b/guitarix.spec
index 9aebe22..85e2a21 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -2,25 +2,19 @@
 # project name remains guitarix however
 %global altname gx_head
 %global altname2 guitarix2
-%global svnrevision svn1245
+%global svnrevision svn1278
 
 Name:           guitarix
-Version:        0.19.0
-Release:        1.0.%{svnrevision}%{?dist}
+Version:        0.20.2
+Release:        1%{?dist}
 Summary:        Mono amplifier to JACK
 Group:          Applications/Multimedia
 License:        GPLv2+
 URL:            http://guitarix.sourceforge.net/
-#Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}-%{svnrevision}.tar.bz2
-Source0:        %{altname2}-%{version}-%{svnrevision}.tar.bz2
+Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{altname2}-%{version}.tar.bz2
 # to grab source from svn: sh guitarix-snapshot.sh 1245
 Source1:        guitarix-snapshot.sh
-# Correct FSF address - included upstream
-Patch0:         guitarix-fsf-address.patch
-# Further correction of source
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  boost-devel
 BuildRequires:  desktop-file-utils
 BuildRequires:  faust
 BuildRequires:  fftw-devel
@@ -75,12 +69,12 @@ and monocompressor ladspa plug-ins that come together with guitarix, but can
 also be used by any other ladspa host.
 
 %prep
-%setup -q -n %{altname2}-%{version}
-%patch0 -p1
+%setup -q -n %{name}-%{version}
 
 # The build system does not use these bundled libraries by default. But
 # just to make sure:
 rm -fr src/zita-convolver src/zita-resampler
+sed -i 's|boost_thread|boost_thread-mt|' wscript
 
 %build
 ./waf -vv configure --prefix=%{_prefix}                                      \
@@ -107,12 +101,7 @@ chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
 
 %find_lang %{name}
 
-%clean
-rm -rf %{buildroot}
-
-
 %files -f %{name}.lang
-%defattr(-,root,root,-)
 %doc changelog COPYING README
 %{_bindir}/%{name}
 %{_datadir}/%{altname}/
@@ -121,16 +110,23 @@ rm -rf %{buildroot}
 %{_datadir}/applications/%{name}.desktop
 
 %files -n ladspa-%{name}-plugins
-%defattr(-,root,root,-)
 %{_libdir}/ladspa/*.so
 
 %changelog
+* Sat Nov 12 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.20.2-1
+- Update to upstream release 0.20.2
+
+* Tue Nov 08 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.20.0-2
+- Update to upstream release 0.20.0
+
+* Sun Oct 30 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.20.0-1.0.svn1278
+- Grab source from latest svn, and removed FSF patch
+- Rebuild for libpng 1.5
+- Removed obsolete tags and clean section from spec
+
 * Sun Oct 30 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.19.0-1.0.svn1245
 - Grab source from svn to rebuild against zita-convolver-3
 
-* Fri Jul 15 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.17.0-2
-- Correct changelog to prevent rpmlint warnings
-
 * Fri Jul 15 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.17.0-1
 - Update to 0.17.0, replace define macro with global
 
diff --git a/sources b/sources
index 56f490f..0dafc67 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-22e1bc92e0804467b22f28b16ca57b50  guitarix2-0.19.0-svn1245.tar.bz2
+8d335d0db77acbc284036120bcc26f75  guitarix2-0.20.2.tar.bz2