dist-git conversion

#2781)

.cvsignore

@@ -1 +0,0 @@
-libsndfile-1.0.4.tar.gz

.gitignore

@@ -0,0 +1 @@
+libsndfile-1.0.11.tar.gz

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/Rootx && { 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-1.0.11-svx-channels.patch

@@ -0,0 +1,12 @@
+diff -Nur libsndfile-1.0.11-orig/src/svx.c libsndfile-1.0.11/src/svx.c
+--- libsndfile-1.0.11-orig/src/svx.c	2004-10-17 02:46:34.000000000 +0200
++++ libsndfile-1.0.11/src/svx.c	2005-03-05 02:08:14.094919120 +0100
+@@ -280,7 +280,7 @@
+ 
+ 					bytecount += psf_binheader_readf (psf, "E4", &channels) ;
+ 
+-					psf_log_printf (psf, "  Channels : %d => %d\n", channels) ;
++					psf_log_printf (psf, "  Channels : %d\n", channels) ;
+ 
+ 					psf_binheader_readf (psf, "j", dword - bytecount) ;
+ 					break ;

libsndfile.spec

@@ -1,18 +1,21 @@
-Summary:	A library for reading and writing sound files.
-Name:		libsndfile
-Version:	1.0.4
-Release:	2
-License:	LGPL
-Group:		System Environment/Libraries
-URL:		http://www.zip.com.au/~erikd/libsndfile/
-Source0:	http://www.zip.com.au/~erikd/libsndfile/%{name}-%{version}.tar.gz
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-buildroot
-BuildRequires:	pkgconfig
+Summary: 	Library for reading and writing sound files
+Name: 		libsndfile
+Version: 	1.0.11
+Release: 	1
+License: 	LGPL
+Group: 		System Environment/Libraries
+URL: 		http://www.mega-nerd.com/libsndfile/
+Source0: 	http://www.mega-nerd.com/libsndfile/libsndfile-%{version}.tar.gz
+Patch0:		libsndfile-1.0.11-svx-channels.patch
+BuildRoot: 	%{_tmppath}/%{name}-%{version}-%{release}-buildroot-%(%{__id_u} -n)
+
+BuildRequires:  alsa-lib-devel
+Provides:       %{name}-octave = %{version}-%{release}
 
 %package devel
-Summary:	Development files for libsndfile.
+Summary:	Development files for libsndfile
 Group:		Development/Libraries
-Requires:	%{name} = %{version}-%{release}
+Requires:	%{name} = %{version}-%{release} pkgconfig
 
 %description
 libsndfile is a C library for reading and writing sound files such as
@@ -26,19 +29,32 @@ 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 files needed to develop with libsndfile.
 
+
 %prep
 %setup -q
+%patch0 -p1 -b .svx-channels
+
 
 %build
-%configure
+%configure --disable-dependency-tracking
 make %{?_smp_mflags}
 
+
 %install
-rm -rf %{buildroot}
-%makeinstall
+rm -rf $RPM_BUILD_ROOT __docs
+make install DESTDIR=$RPM_BUILD_ROOT
+cp -pR $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev/html __docs
+rm -rf $RPM_BUILD_ROOT%{_docdir}/libsndfile1-dev
+
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
+
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
 
 %files
 %defattr(-,root,root,-)
@@ -50,23 +66,34 @@ rm -rf %{buildroot}
 %{_mandir}/man1/sndfile-play.1*
 %{_mandir}/man1/sndfile-convert.1*
 %{_libdir}/%{name}.so.*
-%{_datadir}/octave/site/m/sndfile_load.m
-%{_datadir}/octave/site/m/sndfile_play.m
-%{_datadir}/octave/site/m/sndfile_save.m
+%{_datadir}/octave
 
 %files devel
 %defattr(-,root,root,-)
+%doc __docs/*
 %exclude %{_libdir}/%{name}.la
 %{_includedir}/sndfile.h
 %{_libdir}/%{name}.so
 %{_libdir}/%{name}.a
 %{_libdir}/pkgconfig/sndfile.pc
 
+
 %changelog
-* Wed Nov 10 2004 Matthias Saou <http://freshrpms.net/> 1.0.4-2
-- Bump release to provide Extras upgrade path.
-- Fix spaces/tabs uglyness.
+* Sat Mar  5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-2
+- Fix format string bug (#149863).
+- Drop explicit Epoch 0.
+
+* Sat Dec  4 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.11-0.fdr.1
+- Update to 1.0.11.
+
+* Wed Oct 13 2004 Ville Skyttä <ville.skytta at iki.fi> - 0:1.0.10-0.fdr.1
+- Update to 1.0.10, update URLs, include ALSA support.
+- Disable dependency tracking to speed up the build.
+- Add missing ldconfig invocations.
+- Make -devel require pkgconfig.
+- Include developer docs in -devel.
+- Provide -octave in main package, own more related dirs.
+- Bring specfile up to date with current spec templates.
 
 * Sat Apr 12 2003 Dams <anvil[AT]livna.org> 
 - Initial build.
-

sources

@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5  libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc  libsndfile-1.0.11.tar.gz