From 9ce9d71dda27b843b6ddb26e6de9ca54e24a6cc745ab1fc62cdbb717f6c8ce7f Mon Sep 17 00:00:00 2001 From: OBS User autobuild Date: Thu, 14 Jan 2010 15:17:13 +0000 Subject: [PATCH] checked in OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/speex?expand=0&rev=5 --- baselibs.conf | 4 +- speex.changes | 8 ---- speex.spec | 105 +++++++++++++++++++++++++++----------------------- 3 files changed, 58 insertions(+), 59 deletions(-) diff --git a/baselibs.conf b/baselibs.conf index a34af3f..b9e35ad 100644 --- a/baselibs.conf +++ b/baselibs.conf @@ -1,2 +1,2 @@ -libspeex1 -libspeexdsp1 +speex +libspeex diff --git a/speex.changes b/speex.changes index 2c75298..968f6a3 100644 --- a/speex.changes +++ b/speex.changes @@ -1,11 +1,3 @@ -------------------------------------------------------------------- -Thu Jan 7 18:59:26 UTC 2010 - lnussel@suse.de - -- split off libspeex1 and libspeexdsp1 according to library - packaging policy -- include actual tarball version in package version -- don't package README's for embedded cpus - ------------------------------------------------------------------- Fri Dec 18 13:11:17 CET 2009 - jengelh@medozas.de diff --git a/speex.spec b/speex.spec index 6e7e251..b62417e 100644 --- a/speex.spec +++ b/speex.spec @@ -22,9 +22,9 @@ Name: speex %define package_version 1.2rc1 BuildRequires: libogg-devel pkgconfig Summary: An Open Source, Patent Free Speech Codec -Version: 1.1.999_%package_version -Release: 1 -License: BSD 3-Clause +Version: 1.1.99.91 +Release: 17 +License: BSD3c Group: System/Libraries Url: http://www.speex.org/ Source: %{name}-%{package_version}.tar.bz2 @@ -43,44 +43,49 @@ Speex is a patent free audio codec designed especially for voice narrowband and wideband quality. This project aims to be complementary to the Vorbis codec. -%package -n libspeex1 + + +Authors: +-------- + Jean-Marc Valin + David Rowe + John Francis Edwards + Segher Boessenkool + Atsuhiko Yamanaka + Radim Kolar + +%package -n libspeex Summary: An Open Source, Patent Free Speech Codec Library -License: BSD 3-Clause +License: BSD3c Group: System/Libraries -Obsoletes: libspeex < %version -Provides: libspeex = %version +# bug437293 +%ifarch ppc64 +Obsoletes: speex-64bit +%endif +# -%description -n libspeex1 -Speex is a patent free audio codec designed especially for voice -(unlike Vorbis which targets general audio) signals and providing good -narrowband and wideband quality. This project aims to be complementary -to the Vorbis codec. - -%package -n libspeexdsp1 -Summary: An Open Source, Patent Free Speech Codec Library -License: BSD 3-Clause -Group: System/Libraries - -%description -n libspeexdsp1 +%description -n libspeex Speex is a patent free audio codec designed especially for voice (unlike Vorbis which targets general audio) signals and providing good narrowband and wideband quality. This project aims to be complementary to the Vorbis codec. -# XXX: not sure whether to call it libspeex-devel as it includes -# devel files for libspeexdsp too. having libspeexdsp-devel seems -# extreme. + +Authors: +-------- + Jean-Marc Valin + David Rowe + John Francis Edwards + Segher Boessenkool + Atsuhiko Yamanaka + Radim Kolar + %package devel Summary: Development package for SpeeX -License: BSD 3-Clause +License: BSD3c Group: Development/Libraries/C and C++ -Provides: libspeex-devel = %version-%release -Obsoletes: libspeex-devel < %version-%release -Requires: libspeex1 = %version -Requires: libspeexdsp1 = %version -Requires: glibc-devel -Requires: libogg-devel +Requires: libspeex glibc-devel # bug437293 %ifarch ppc64 Obsoletes: speex-devel-64bit @@ -91,6 +96,17 @@ Obsoletes: speex-devel-64bit This package contains the files needed to compile programs that use the SpeeX library. + + +Authors: +-------- + Jean-Marc Valin + David Rowe + John Francis Edwards + Segher Boessenkool + Atsuhiko Yamanaka + Radim Kolar + %prep %setup -q -n %{name}-%{package_version} %patch1 @@ -100,24 +116,18 @@ autoreconf -fi %configure \ --disable-static \ --with-ogg-libraries=%{_libdir} -make %{?jobs:-j%{jobs}} +make %{?_smp_mflags} %install %makeinstall # remove duped documents -rm -rf %{buildroot}%{_datadir}/doc/speex* +rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/speex* # remove unneeded *.la files -rm -f %{buildroot}%{_libdir}/*.la -rm -f %{buildroot}%{_libdir}/*.a +rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +%post -n libspeex -p /sbin/ldconfig -%post -n libspeex1 -p /sbin/ldconfig - -%postun -n libspeex1 -p /sbin/ldconfig - -%post -n libspeexdsp1 -p /sbin/ldconfig - -%postun -n libspeexdsp1 -p /sbin/ldconfig +%postun -n libspeex -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -126,22 +136,19 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root) %doc AUTHORS ChangeLog COPYING NEWS README TODO %doc doc/*.pdf -%{_bindir}/speex* -%{_mandir}/man?/* +%{_bindir}/* +%doc %{_mandir}/man?/* -%files -n libspeex1 +%files -n libspeex %defattr(-,root,root) -%{_libdir}/libspeex.so.* - -%files -n libspeexdsp1 -%defattr(-,root,root) -%{_libdir}/libspeexdsp.so.* +%{_libdir}/libspeex*.so.* %files devel %defattr(-,root,root) +%doc README.TI-DSP README.blackfin README.symbian %doc doc/manual.pdf %{_includedir}/* -%{_libdir}/lib*.so +%{_libdir}/libspeex*.so %{_libdir}/pkgconfig/*.pc %{_datadir}/aclocal/*.m4