dist-git conversion

#2781)

Makefile

@@ -1,21 +0,0 @@
-# Makefile for source rpm: libsndfile
-# $Id$
-NAME := libsndfile
-SPECFILE = $(firstword $(wildcard *.spec))
-
-define find-makefile-common
-for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done
-endef
-
-MAKEFILE_COMMON	:= $(shell $(find-makefile-common))
-
-ifeq ($(MAKEFILE_COMMON),)
-# attept a checkout
-define checkout-makefile-common
-test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2
-endef
-
-MAKEFILE_COMMON := $(shell $(checkout-makefile-common))
-endif
-
-include $(MAKEFILE_COMMON)

libsndfile.spec

@@ -1,8 +1,8 @@
 Summary:	Library for reading and writing sound files
 Name:		libsndfile
 Version:	1.0.17
-Release:	3%{?dist}
-License:	LGPL
+Release:	6%{?dist}
+License:	LGPLv2+
 Group:		System Environment/Libraries
 URL:		http://www.mega-nerd.com/libsndfile/
 Source0:	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
@@ -10,13 +10,9 @@ Patch0:         libsndfile-1.0.17+flac-1.1.3.patch
 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 @@ currently read/write 8, 16, 24 and 32-bit PCM files as well as 32 and
 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 @@ This package contains files needed to develop with libsndfile.
 %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,29 @@ make install DESTDIR=$RPM_BUILD_ROOT
 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
+EOF
+
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -70,18 +102,31 @@ rm -rf $RPM_BUILD_ROOT
 %{_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 25 2008 Andreas Thienemann <andreas@bawue.net> - 1.0.17-6
+- Removed spurious #endif in the libsndfile.h wrapper. Thx to Edward
+  Sheldrake for finding it. Fixes #468508.
+
+* Thu Oct 23 2008 Andreas Thienemann <andreas@bawue.net> - 1.0.17-5
+- Fixed multilib conflict. #342401
+- Made flac support actually work correctly.
+
+* Thu Aug  7 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 1.0.17-4
+- fix license tag
+
 * Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0.17-3
 - Autorebuild for GCC 4.3