rpms/libsndfile/FC-2 libsndfile-1.0.11-svx-channels.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 libsndfile.spec, 1.4, 1.5 sources, 1.2, 1.3
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Tue Mar 8 19:31:09 UTC 2005
Author: scop
Update of /cvs/extras/rpms/libsndfile/FC-2
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31892/FC-2
Modified Files:
.cvsignore libsndfile.spec sources
Added Files:
libsndfile-1.0.11-svx-channels.patch
Log Message:
auto-import libsndfile-1.0.11-0.fdr.2.2 on branch FC-2 from libsndfile-1.0.11-0.fdr.2.2.src.rpm
https://bugzilla.fedora.us/show_bug.cgi?id=2156
libsndfile-1.0.11-svx-channels.patch:
--- NEW FILE libsndfile-1.0.11-svx-channels.patch ---
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 ;
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 8 Nov 2004 04:47:40 -0000 1.2
+++ .cvsignore 8 Mar 2005 19:31:07 -0000 1.3
@@ -1 +1 @@
-libsndfile-1.0.4.tar.gz
+libsndfile-1.0.11.tar.gz
Index: libsndfile.spec
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/libsndfile.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- libsndfile.spec 8 Nov 2004 04:47:58 -0000 1.4
+++ libsndfile.spec 8 Mar 2005 19:31:07 -0000 1.5
@@ -1,19 +1,21 @@
-Summary: A library for reading and writing sound files.
+Summary: Library for reading and writing sound files
Name: libsndfile
-Version: 1.0.4
-Release: 0.fdr.1.2
-Epoch: 0
+Version: 1.0.11
+Release: 0.fdr.2.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
+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} = %{epoch}:%{version}-%{release}
+Requires: %{name} = %{version}-%{release} pkgconfig
%description
libsndfile is a C library for reading and writing sound files such as
@@ -27,19 +29,32 @@
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,-)
@@ -51,18 +66,34 @@
%{_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
+* Sat Mar 5 2005 Michael Schwendt <mschwendt[AT]users.sf.net> - 1.0.11-0.fdr.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.
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/libsndfile/FC-2/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 8 Nov 2004 04:47:40 -0000 1.2
+++ sources 8 Mar 2005 19:31:07 -0000 1.3
@@ -1 +1 @@
-33929011f48fa2a4b72baf54c69196c5 libsndfile-1.0.4.tar.gz
+9ec0b3610041423a57387f284849f2fc libsndfile-1.0.11.tar.gz
More information about the scm-commits
mailing list