From 9d4002a8a81c0ba8416bd308d80e83a38059fb4c Mon Sep 17 00:00:00 2001
From: Michel Alexandre Salim <salimma@fedoraproject.org>
Date: Sat, 3 Jul 2010 18:14:58 +0000
Subject: [PATCH] - update all branches to 1.5.0 - fix incorrect version
 declaration in pkgconfig file

---
 rubberband-1.5.0-fix_ver.patch | 20 ++++++++++++++++++++
 rubberband.spec                | 14 +++++++++++---
 2 files changed, 31 insertions(+), 3 deletions(-)
 create mode 100644 rubberband-1.5.0-fix_ver.patch

diff --git a/rubberband-1.5.0-fix_ver.patch b/rubberband-1.5.0-fix_ver.patch
new file mode 100644
index 0000000..dc835d7
--- /dev/null
+++ b/rubberband-1.5.0-fix_ver.patch
@@ -0,0 +1,20 @@
+--- rubberband-1.5.0/rubberband.pc.in.fix_ver	2010-05-02 21:06:05.000000000 +0200
++++ rubberband-1.5.0/rubberband.pc.in	2010-07-03 20:01:01.396222596 +0200
+@@ -4,7 +4,7 @@
+ includedir=${prefix}/include
+ 
+ Name: rubberband
+-Version: 1.4.0
++Version: 1.5.0
+ Description: 
+ Libs: -L${libdir} -lrubberband
+ Cflags: -I${includedir} 
+--- rubberband-1.5.0/configure.ac.fix_ver	2010-05-02 21:06:05.000000000 +0200
++++ rubberband-1.5.0/configure.ac	2010-07-03 20:02:24.968410068 +0200
+@@ -1,5 +1,5 @@
+ 
+-AC_INIT(RubberBand, 1.2, cannam@all-day-breakfast.com)
++AC_INIT(RubberBand, 1.5, cannam@all-day-breakfast.com)
+ 
+ AC_CONFIG_SRCDIR(src/StretcherImpl.h)
+ AC_PROG_CXX
diff --git a/rubberband.spec b/rubberband.spec
index 75bed76..ad5f464 100644
--- a/rubberband.spec
+++ b/rubberband.spec
@@ -1,14 +1,18 @@
 Name:           rubberband
 Version:        1.5.0
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Audio time-stretching and pitch-shifting library
 
 Group:          System Environment/Libraries
 License:        GPLv2+
 URL:            http://www.breakfastquay.com/rubberband/
 Source0:        http://code.breakfastquay.com/attachments/download/1/rubberband-1.5.0.tar.bz2
-Patch0:         rubberband-1.5.0-gcc44.patch
-Patch1:         rubberband-1.5.0-mk.patch
+Patch0:         %{name}-1.5.0-gcc44.patch
+Patch1:         %{name}-1.5.0-mk.patch
+# incorrect version in configure.ac (harmless) and .pc.in (could be bad
+# if a consumer strictly requires 1.5.0 functionality);
+# e-mailed to author
+Patch2:		%{name}-1.5.0-fix_ver.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  fftw-devel libsamplerate-devel libsndfile-devel
@@ -35,6 +39,7 @@ developing applications that use %{name}.
 %setup -q
 %patch0 -p1 -b .gcc44
 %patch1 -p1 -b .mk
+%patch2 -p1 -b .fix_ver
 
 
 %build
@@ -75,6 +80,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sat Jul  3 2010 Michel Salim <salimma@fedoraproject.org> - 1.5.0-2
+- Fixed pkg-config version declaration
+
 * Wed Jun  2 2010 Tom "spot" Callaway <tcallawa@redhat.com> - 1.5.0-1
 - update to 1.5.0
 - disable static libs