rpms/libsndfile/devel libsndfile.spec,1.17,1.18
Andreas Thienemann
ixs at fedoraproject.org
Thu Oct 23 23:30:28 UTC 2008
Author: ixs
Update of /cvs/pkgs/rpms/libsndfile/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv14714
Modified Files:
libsndfile.spec
Log Message:
* Thu Oct 23 2008 Andreas Thienemann <andreas at bawue.net> - 1.0.17-5
- Fixed multilib conflict. #342401
- Made flac support actually work correctly.
Index: libsndfile.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libsndfile/devel/libsndfile.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- libsndfile.spec 7 Aug 2008 15:39:58 -0000 1.17
+++ libsndfile.spec 23 Oct 2008 23:29:57 -0000 1.18
@@ -1,7 +1,7 @@
Summary: Library for reading and writing sound files
Name: libsndfile
Version: 1.0.17
-Release: 4%{?dist}
+Release: 5%{?dist}
License: LGPLv2+
Group: System Environment/Libraries
URL: http://www.mega-nerd.com/libsndfile/
@@ -10,13 +10,9 @@
Patch1: libsndfile-1.0.17-flac-buffer-overflow.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
-BuildRequires: alsa-lib-devel
+BuildRequires: alsa-lib-devel, pkgconfig, flac-devel, sqlite-devel, libogg-devel
Provides: %{name}-octave = %{version}-%{release}
-%package devel
-Summary: Development files for libsndfile
-Group: Development/Libraries
-Requires: %{name} = %{version}-%{release} pkgconfig
%description
libsndfile is a C library for reading and writing sound files such as
@@ -25,6 +21,13 @@
64-bit floating point WAV files and a number of compressed formats. It
compiles and runs on *nix, MacOS, and Win32.
+
+%package devel
+Summary: Development files for libsndfile
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release} pkgconfig
+
+
%description devel
libsndfile is a C library for reading and writing sound files such as
AIFF, AU, WAV, and others through one standard interface.
@@ -36,8 +39,14 @@
%patch0 -p1
%patch1 -p1
+
%build
-%configure --disable-dependency-tracking
+%configure \
+ --disable-dependency-tracking \
+ --enable-flac \
+ --enable-sqlite \
+ --enable-alsa \
+ --enable-largefile
make %{?_smp_mflags}
@@ -47,6 +56,31 @@
cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+# fix multilib issues
+%ifarch x86_64 s390x ia64 ppc64 sparc64
+%define wordsize 64
+%else
+%define wordsize 32
+%endif
+
+mv %{buildroot}%{_includedir}/sndfile.h \
+ %{buildroot}%{_includedir}/sndfile-%{wordsize}.h
+
+cat > %{buildroot}%{_includedir}/sndfile.h <<EOF
+#include <bits/wordsize.h>
+
+#if __WORDSIZE == 32
+# include "sndfile-32.h"
+#elif __WORDSIZE == 64
+# include "sndfile-64.h"
+#else
+# error "unexpected value for __WORDSIZE macro"
+#endif
+
+#endif
+EOF
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -70,18 +104,24 @@
%{_libdir}/%{name}.so.*
%{_datadir}/octave
+
%files devel
%defattr(-,root,root,-)
%doc __docs/*
%exclude %{_libdir}/%{name}.la
%{_includedir}/sndfile.h
%{_includedir}/sndfile.hh
+%{_includedir}/sndfile-%{wordsize}.h
%{_libdir}/%{name}.so
%{_libdir}/%{name}.a
%{_libdir}/pkgconfig/sndfile.pc
%changelog
+* Thu Oct 23 2008 Andreas Thienemann <andreas at bawue.net> - 1.0.17-5
+- Fixed multilib conflict. #342401
+- Made flac support actually work correctly.
+
* Thu Aug 7 2008 Tom "spot" Callaway <tcallawa at redhat.com> - 1.0.17-4
- fix license tag
More information about the scm-commits
mailing list