[guitarix: 1/2] New upstream 0.22.2

[Brendan Jones]

commit 87c45ef7abcd051625339df10ccb37974eb01bcc
Author: Brendan Jones <brendan.jones.it at gmail.com>
Date:   Fri May 11 06:14:15 2012 +0200

    New upstream 0.22.2

 .gitignore           |    1 +
 guitarix-snapshot.sh |   33 ---------------------------------
 guitarix.spec        |   22 ++++++++--------------
 sources              |    3 +--
 4 files changed, 10 insertions(+), 49 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 4a48c22..21bedf6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,4 @@ guitarix-0.11.0.tar.bz2
 /guitarix2-0.20.2.tar.bz2
 /guitarix2-0.21.0.tar.bz2
 /guitarix-0.21.0-glib.patch
+/guitarix2-0.22.2.tar.bz2
diff --git a/guitarix.spec b/guitarix.spec
index 417cd45..6b800d2 100644
--- a/guitarix.spec
+++ b/guitarix.spec
@@ -4,17 +4,13 @@
 %global altname2 guitarix2
 
 Name:           guitarix
-Version:        0.21.0
+Version:        0.22.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}.tar.bz2
-# to grab source from svn: sh guitarix-snapshot.sh 1245
-Source1:        guitarix-snapshot.sh
-# add missing glibmm headers for gcc 4.7
-Patch0:         guitarix-0.21.0-glib.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  faust
@@ -71,12 +67,13 @@ and monocompressor ladspa plug-ins that come together with guitarix, but can
 also be used by any other ladspa host.
 
 %prep
-%setup -q -n %{name}2-%{version}
-%patch0 -p1
+%setup -q -n %{name}-%{version}
+#%patch0 -p1
 
 # 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 -e 's|-O3|%{optflags}|' wscript
 
 %build
 ./waf -vv configure --prefix=%{_prefix}                                      \
@@ -116,14 +113,11 @@ chmod 644 %{buildroot}/%{_datadir}/%{altname}/skins/*
 %{_datadir}/ladspa
 
 %changelog
-* Tue Jan 17 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.21.0-1
-- Update to upstream 0.21.0, correct fail to build (missing glibmm headers)
-
-* Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.20.2-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+* Thu May 03 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.22.2-1
+- Update to upstream 0.22.0
 
-* Sun Nov 20 2011 Adam Huffman <adam at vaioz.verdurin.salon> - 0.20.2-4
-- rebuild for new Boost in Rawhide
+* Tue Jan 17 2012 Brendan Jones <brendan.jones.it at gmail.com> - 0.21.0-1
+- Update to upstream 0.21.0
 
 * Sat Nov 12 2011 Brendan Jones <brendan.jones.it at gmail.com> - 0.20.2-3
 - Add boost-devel build requires
diff --git a/sources b/sources
index 972cd07..bf8d8b6 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-ed40664453c9b2b61240f46ffee62f14  guitarix2-0.21.0.tar.bz2
-e072f1abfe770aa6e55900e8d8bacb60  guitarix-0.21.0-glib.patch
+ac757be0a0ebefb18d5527269c10cad9  guitarix2-0.22.2.tar.bz2