rpms/libsndfile/devel libsndfile.spec,1.25,1.26

[Štěpán Kasal]

Author: kasal

Update of /cvs/extras/rpms/libsndfile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21014

Modified Files:
	libsndfile.spec 
Log Message:
- Do not build against Jack on RHEL
- Fix the Source0: URL
- Fix the licence tag


Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -p -r1.25 -r1.26
--- libsndfile.spec	14 Nov 2009 09:58:43 -0000	1.25
+++ libsndfile.spec	1 Feb 2010 15:14:16 -0000	1.26
@@ -1,16 +1,18 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.20
-Release:	4%{?dist}
-License:	LGPLv2+
+Release:	5%{?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/libsndfile-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+Source0:	http://www.mega-nerd.com/libsndfile/files/libsndfile-%{version}.tar.gz
+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
@@ -103,6 +105,9 @@ cat > %{buildroot}%{_includedir}/sndfile
 #endif
 EOF
 
+%if 0%{?rhel} != 0
+rm -f %{buildroot}%{_bindir}/sndfile-jackplay
+%endif
 
 
 %clean
@@ -126,7 +131,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/sndfile-convert
 %{_bindir}/sndfile-regtest
 %{_bindir}/sndfile-cmp
+%if 0%{?rhel} == 0
 %{_bindir}/sndfile-jackplay
+%endif
 %{_bindir}/sndfile-metadata-get
 %{_bindir}/sndfile-metadata-set
 %{_mandir}/man1/sndfile-info.1*
@@ -148,6 +155,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Feb  1 2010 Stepan Kasal <skasal at redhat.com> - 1.0.20-5
+- Do not build against Jack on RHEL
+- Fix the Source0: URL
+- Fix the licence tag
+
 * Sat Nov 14 2009 Orcan Ogetbil <oget[dot]fedora[at]gmail[dot]com> - 1.0.20-4
 - Split utils into a subpackage