From 2bbc964e9928f06f7e4ec3133a3f101166d49c9c Mon Sep 17 00:00:00 2001
From: Orcan Ogetbil <oget@fedoraproject.org>
Date: Tue, 11 May 2010 14:50:16 +0000
Subject: [PATCH] - Update to 10.0.21 - Do not include the static library in
 the package (RHBZ#556074) - Remove BR on jack since sndfile-jackplay is not
 provided anymore

---
 .cvsignore      |  2 +-
 libsndfile.spec | 42 ++++++++++++++++++++++++------------------
 sources         |  2 +-
 3 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 1a15c29..3a490ee 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libsndfile-1.0.20.tar.gz
+libsndfile-1.0.21.tar.gz
diff --git a/libsndfile.spec b/libsndfile.spec
index 7d3e9c6..f497d9a 100644
--- a/libsndfile.spec
+++ b/libsndfile.spec
@@ -1,18 +1,15 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
-Version:	1.0.20
-Release:	5%{?dist}
+Version:	1.0.21
+Release:	1%{?dist}
 License:	LGPLv2+ and GPLv2+ and BSD
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/files/libsndfile-%{version}.tar.gz
-BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+BuildRoot:	%(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 
 BuildRequires:	alsa-lib-devel
 BuildRequires:	flac-devel
-%if 0%{?rhel} != 0
-BuildRequires:	jack-audio-connection-kit-devel
-%endif
 BuildRequires:	libogg-devel
 BuildRequires:	libvorbis-devel
 BuildRequires:	pkgconfig
@@ -51,7 +48,7 @@ Obsoletes:	libsndfile < 1.0.20-4
 %description utils
 libsndfile is a C library for reading and writing sound files such as
 AIFF, AU, WAV, and others through one standard interface.
-This package contains commandline utilities for libsndfile.
+This package contains command line utilities for libsndfile.
 
 
 %prep
@@ -109,6 +106,8 @@ EOF
 rm -f %{buildroot}%{_bindir}/sndfile-jackplay
 %endif
 
+# remove static lib (RHBZ#556074)
+rm -f %{buildroot}%{_libdir}/%{name}.a
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -126,20 +125,23 @@ rm -rf $RPM_BUILD_ROOT
 
 %files utils
 %defattr(-,root,root,-)
-%{_bindir}/sndfile-info
-%{_bindir}/sndfile-play
-%{_bindir}/sndfile-convert
-%{_bindir}/sndfile-regtest
 %{_bindir}/sndfile-cmp
-%if 0%{?rhel} == 0
-%{_bindir}/sndfile-jackplay
-%endif
+%{_bindir}/sndfile-concat
+%{_bindir}/sndfile-convert
+%{_bindir}/sndfile-deinterleave
+%{_bindir}/sndfile-info
+%{_bindir}/sndfile-interleave
 %{_bindir}/sndfile-metadata-get
 %{_bindir}/sndfile-metadata-set
-%{_mandir}/man1/sndfile-info.1*
-%{_mandir}/man1/sndfile-play.1*
+%{_bindir}/sndfile-play
+%{_bindir}/sndfile-regtest
+%{_mandir}/man1/sndfile-cmp.1*
+%{_mandir}/man1/sndfile-concat.1*
 %{_mandir}/man1/sndfile-convert.1*
-
+%{_mandir}/man1/sndfile-info.1*
+%{_mandir}/man1/sndfile-metadata-get.1*
+%{_mandir}/man1/sndfile-metadata-set.1*
+%{_mandir}/man1/sndfile-play.1*
 
 %files devel
 %defattr(-,root,root,-)
@@ -150,11 +152,15 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/sndfile.hh
 %{_includedir}/sndfile-%{wordsize}.h
 %{_libdir}/%{name}.so
-%{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
 
 %changelog
+* Tue May 11 2010 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.21-1
+- Update to 10.0.21
+- Do not include the static library in the package (RHBZ#556074)
+- Remove BR on jack since sndfile-jackplay is not provided anymore
+
 * Mon Feb  1 2010 Stepan Kasal <skasal@redhat.com> - 1.0.20-5
 - Do not build against Jack on RHEL
 - Fix the Source0: URL
diff --git a/sources b/sources
index d81d3b8..5dfc886 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e0553e12c7a467af44693e95e2eac668  libsndfile-1.0.20.tar.gz
+880a40ec636ab2185b97f8927299b292  libsndfile-1.0.21.tar.gz